Use read byte data for ENE detect

* Registering detector in GigabyteRGBFusion2GPUControllerDetect.cpp
* Link to [webpage](https://www.gigabyte.com/Graphics-Card/GV-
N3070AORUS-M-8GD-rev-20)

.gitignore

@@ -5,6 +5,7 @@
 OpenRGB
 openrgb
 OpenRGB-x86_64.AppImage
+60-openrgb.rules
 
 # Directories
 .build/
@@ -37,17 +38,19 @@ Thumbs.db
 !dependencies/**/*.bat
 
 # C++ objects and libs
-*.slo
-*.lo
-*.o
 *.a
+*.dll
+*.dylib
+*.ii
 *.la
 *.lai
+*.lo
+*.o
+*.s
+*.slo
 *.so
 *.so.*
-*.dll
 !dependencies/**/*.dll
-*.dylib
 
 # Qt-es
 object_script.*.Release
@@ -87,8 +90,7 @@ compile_commands.json
 
 # QtCreator local machine specific files for imported projects
 *creator.user*
-
-*_qmlcache.qrc
+*.qrc
 
 # Visual Studio generated files
 *.ib_pdb_index
@@ -110,4 +112,8 @@ compile_commands.json
 *.Release
 
 # Clang tooling files
-compile_commands.json
+compile_commands.json
+
+# Generated i18n files
+*.qm
+

.gitlab-ci.yml

@@ -27,6 +27,34 @@ before_script:
     - export QT_SELECT=qt5
     - export APPIMAGE_EXTRACT_AND_RUN=1
 
+#-----------------------------------------------------------------------#
+# Supported Devices Build Target                                        #
+#-----------------------------------------------------------------------#
+"Supported Devices":
+  <<: *ccache_init
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bullseye-64
+  stage: build
+  script:
+  - qmake
+  - make -j$(nproc)
+  - ./scripts/build-supported-devices-md.sh $CI_PROJECT_DIR $CI_COMMIT_SHORT_SHA
+
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Supported_Devices_${CI_COMMIT_SHORT_SHA}"
+    paths:
+    - ./*.md
+    exclude:
+    - README.md
+    - CONTRIBUTING.md
+    expire_in: 30 days
+
+  rules:
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
+
 #-----------------------------------------------------------------------#
 # Linux (AppImage) 32-bit Build Target                                  #
 #-----------------------------------------------------------------------#
@@ -46,6 +74,13 @@ before_script:
     - README.md
     expire_in: 30 days
 
+  rules:
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
+
 #-----------------------------------------------------------------------#
 # Linux (AppImage) 64-bit Build Target                                  #
 #-----------------------------------------------------------------------#
@@ -86,6 +121,13 @@ before_script:
     - openrgb-dbgsym*.deb
     expire_in: 30 days
 
+  rules:
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
+
 #-----------------------------------------------------------------------#
 # Linux (.deb) Debian Buster (Legacy) 64-bit Build Target               #
 #-----------------------------------------------------------------------#
@@ -107,6 +149,13 @@ before_script:
     - openrgb-dbgsym*.deb
     expire_in: 30 days
 
+  rules:
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
+
 #-----------------------------------------------------------------------#
 # Linux (.deb) Debian Bullseye 32-bit Build Target                      #
 #-----------------------------------------------------------------------#
@@ -128,6 +177,13 @@ before_script:
     - openrgb-dbgsym*.deb
     expire_in: 30 days
 
+  rules:
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
+
 #-----------------------------------------------------------------------#
 # Linux (.deb) Debian Bullseye 64-bit Build Target                      #
 #-----------------------------------------------------------------------#
@@ -149,6 +205,69 @@ before_script:
     - openrgb-dbgsym*.deb
     expire_in: 30 days
 
+  rules:
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
+
+#-----------------------------------------------------------------------#
+# Linux (.deb) Debian Bookworm 32-bit Build Target                      #
+#-----------------------------------------------------------------------#
+"Linux 32 .deb (Debian Bookworm)":
+  <<: *ccache_init
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-32
+  stage: build
+  script:
+  - dpkg-architecture -l
+  - dpkg-buildpackage --target-arch i386 -us -B
+  - rm -v ../openrgb-dbgsym*.deb
+  - mv -v ../openrgb*.deb ./
+
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_32_deb_${CI_COMMIT_SHORT_SHA}"
+    paths:
+    - openrgb*.deb
+    exclude:
+    - openrgb-dbgsym*.deb
+    expire_in: 30 days
+
+  rules:
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
+
+#-----------------------------------------------------------------------#
+# Linux (.deb) Debian Bookworm 64-bit Build Target                      #
+#-----------------------------------------------------------------------#
+"Linux 64 .deb (Debian Bookworm)":
+  <<: *ccache_init
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-64
+  stage: build
+  script:
+  - dpkg-architecture -l
+  - dpkg-buildpackage -us -B
+  - rm -v ../openrgb-dbgsym*.deb
+  - mv -v ../openrgb*.deb ./
+
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_64_deb_${CI_COMMIT_SHORT_SHA}"
+    paths:
+    - openrgb*.deb
+    exclude:
+    - openrgb-dbgsym*.deb
+    expire_in: 30 days
+
+  rules:
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
+
 #-----------------------------------------------------------------------#
 # Linux (.rpm, f35) 64-bit Build Target                                 #
 #-----------------------------------------------------------------------#
@@ -156,8 +275,8 @@ before_script:
   image: fedora:35
   stage: build
   script:
-  - dnf install rpmdevtools dnf-plugins-core -y 
-  - rpmdev-setuptree 
+  - dnf install rpmdevtools dnf-plugins-core -y
+  - rpmdev-setuptree
   - ls /root/
   - cp fedora/OpenRGB.spec /root/rpmbuild/SPECS
   - cp ../OpenRGB /root/rpmbuild/SOURCES/ -r
@@ -176,6 +295,13 @@ before_script:
     - openrgb*.rpm
     expire_in: 30 days
 
+  rules:
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
+
 #-----------------------------------------------------------------------#
 # Linux (.rpm, f36) 64-bit Build Target                                 #
 #-----------------------------------------------------------------------#
@@ -203,6 +329,13 @@ before_script:
     - openrgb*.rpm
     expire_in: 30 days
 
+  rules:
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
+
 #-----------------------------------------------------------------------#
 # Debian 32 Buster test                                                 #
 #-----------------------------------------------------------------------#
@@ -271,6 +404,40 @@ before_script:
   needs:
   - "Linux 64 .deb (Debian Bullseye)"
 
+#-----------------------------------------------------------------------#
+# Debian 32 Bookworm test                                               #
+#-----------------------------------------------------------------------#
+"Debian 32 Bookworm":
+  image: i386/debian:bookworm
+  stage: test
+  script:
+  - apt update
+  - DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*i386.deb
+  - openrgb --version
+  - openrgb -l
+  - apt remove -y openrgb
+  dependencies:
+  - "Linux 32 .deb (Debian Bookworm)"
+  needs:
+  - "Linux 32 .deb (Debian Bookworm)"
+
+#-----------------------------------------------------------------------#
+# Debian 64 Bookworm test                                               #
+#-----------------------------------------------------------------------#
+"Debian 64 Bookworm":
+  image: amd64/debian:bookworm
+  stage: test
+  script:
+  - apt update
+  - DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*amd64.deb
+  - openrgb --version
+  - openrgb -l
+  - apt remove -y openrgb
+  dependencies:
+  - "Linux 64 .deb (Debian Bookworm)"
+  needs:
+  - "Linux 64 .deb (Debian Bookworm)"
+
 #-----------------------------------------------------------------------#
 # Ubuntu 64 20.04LTS test                                               #
 #-----------------------------------------------------------------------#
@@ -289,10 +456,10 @@ before_script:
   - "Linux 64 .deb (Debian Buster)"
 
 #-----------------------------------------------------------------------#
-# Ubuntu 64 21.10 test                                                  #
+# Ubuntu 64 22.04 test                                                  #
 #-----------------------------------------------------------------------#
-"Ubuntu 64 21.10":
-  image: ubuntu:impish
+"Ubuntu 64 22.04LTS":
+  image: ubuntu:jammy
   stage: test
   script:
   - apt update
@@ -301,9 +468,9 @@ before_script:
   - openrgb -l
   - apt remove -y openrgb
   dependencies:
-  - "Linux 64 .deb (Debian Bullseye)"
+  - "Linux 64 .deb (Debian Bookworm)"
   needs:
-  - "Linux 64 .deb (Debian Bullseye)"
+  - "Linux 64 .deb (Debian Bookworm)"
 
 #-----------------------------------------------------------------------#
 # Fedora 64 v35 test                                                    #
@@ -380,6 +547,10 @@ before_script:
   - Pop-Location
   - _fold_final_
 
+  - _fold_start_ 'Generate qm files'
+  - .\_qt\5.15.0\msvc2019\bin\lrelease OpenRGB.pro
+  - _fold_final_
+
   - _fold_start_ 'run qmake and generate the msvc nmake makefile'
   - mkdir _build; cd _build
   - ..\_qt\5.15.0\msvc2019\bin\qmake ..\OpenRGB.pro
@@ -406,6 +577,13 @@ before_script:
     - 'OpenRGB Windows 32-bit'
     expire_in: 30 days
 
+  rules:
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
+
 #-----------------------------------------------------------------------#
 # Windows (64-bit) Build Target                                         #
 #-----------------------------------------------------------------------#
@@ -449,6 +627,10 @@ before_script:
   - Pop-Location
   - _fold_final_
 
+  - _fold_start_ 'Generate qm files'
+  - .\_qt\5.15.0\msvc2019_64\bin\lrelease OpenRGB.pro
+  - _fold_final_
+
   - _fold_start_ 'run qmake and generate the msvc nmake makefile'
   - mkdir _build; cd _build
   - ..\_qt\5.15.0\msvc2019_64\bin\qmake ..\OpenRGB.pro
@@ -499,6 +681,9 @@ before_script:
     when: on_success
   - if: '$BUILD_MACOS =~ /.+/'
     when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
 
 "MacOS Intel":
   tags:
@@ -521,3 +706,6 @@ before_script:
     when: on_success
   - if: '$BUILD_MACOS =~ /.+/'
     when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true

.gitlab/CODEOWNERS

@@ -10,8 +10,8 @@ CODEOWNERS @Calcprogrammer1
 #-----------------------------------------------------------------------------#
 [Controllers]
 /Controllers/AMDWraithPrismController/
-/Controllers/ASRockPolychromeSMBusController/
 /Controllers/ASRockPolychromeUSBController/
+/Controllers/ASRockSMBusController/
 /Controllers/AlienwareController/
 /Controllers/AlienwareKeyboardController/
 /Controllers/AnnePro2Controller/
@@ -40,8 +40,8 @@ CODEOWNERS @Calcprogrammer1
 /Controllers/EKController/                                  @Dr_No
 /Controllers/ENESMBusController/
 /Controllers/EVGAAmpereGPUController/                       @TheRogueZeta
-/Controllers/EVGAGP102GPUController/                        
-/Controllers/EVGAPascalGPUController/                       
+/Controllers/EVGAGP102GPUController/
+/Controllers/EVGAPascalGPUController/
 /Controllers/EVGATuringGPUController/                       @TheRogueZeta
 /Controllers/EVGAUSBController/                             @Dr_No
 /Controllers/EVisionKeyboardController/
@@ -102,5 +102,7 @@ CODEOWNERS @Calcprogrammer1
 #   that is an exception to the above should be explicitly named here         #
 #-----------------------------------------------------------------------------#
 [Controllers]
-/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.cpp            @TheRogueZeta
-/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.h              @TheRogueZeta
+/Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController.cpp          @TheRogueZeta
+/Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController.h            @TheRogueZeta
+/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV1SMBus.cpp      @TheRogueZeta
+/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV1SMBus.h        @TheRogueZeta

AutoStart/AutoStart-FreeBSD.cpp

@@ -4,6 +4,7 @@
 
 #include <fstream>
 #include <iostream>
+#include <limits.h>
 #include <unistd.h>
 #include <sstream>
 
@@ -120,7 +121,7 @@ std::string AutoStart::GetExePath()
     char exepath[ PATH_MAX ];
 
     ssize_t count = readlink("/proc/self/exe", exepath, PATH_MAX);
-    
+
     return(std::string(exepath, (count > 0) ? count : 0));
 }
 
@@ -159,7 +160,7 @@ void AutoStart::InitAutoStart(std::string name)
         std::error_code ec;
 
         bool success = true;
-        
+
         if(!filesystem::exists(autostart_dir))
         {
             success = filesystem::create_directories(autostart_dir, ec);

CONTRIBUTING.md

@@ -12,6 +12,16 @@ To create a merge request, log into GitLab and fork the OpenRGB project.  Push y
 * Follow the Style Guidelines below when making your code changes.
 * Avoid using `git merge` when updating your fork.  The OpenRGB project uses a linear git history, meaning all changes are rebased onto the tip of master.  By using `git rebase` to update your fork, you will make it easier to accept merge requests.
 
+### Pipelines, Shared Runners and Quotas
+
+Since mid 2022 Gitlab has limited the usage of shared runners to all projects and whilst quite geneorous quotas are allowed
+ for open source projects it is possible to exhaust them. With that in mind not all jobs within the pipeline build are
+ triggered to automatically run with every push to your branch with the exception of the Windows 64bit and Linux Appimage 64bit
+ jobs. If you need to test or share another build you can still start it manually from your pipeline queue.
+ Once a merge request is created all architectures and platforms will be compiled to ensure that they are ready to merge.
+
+Please refer to the following link for [further information relating to minutes and quotas](https://docs.gitlab.com/ee/ci/pipelines/cicd_minutes.html).
+
 ## Style Guidelines
 
 OpenRGB is written in C++, uses the Qt framework for UI, and uses the QMake build system.  While OpenRGB does use C++, I am primarily a C programmer and prefer doing things "C Style" vs. C++ style.  C++'s object oriented programming features fit the needs of a program such as OpenRGB where there are many implementations of a single interface so I chose to write it in C++ over C.  Still, however, I prefer using C-style code where possible.  When making changes to existing code files, try to follow the existing style.  Merge requests that go out of their way to restyle code will not be accepted and will be sent back for rework.

Controllers/A4TechController/A4Tech_Detector.cpp

@@ -0,0 +1,34 @@
+/*-----------------------------------------------------*\
+| OpenRGB includes                                      |
+\*-----------------------------------------------------*/
+#include <hidapi/hidapi.h>
+#include "Detector.h"
+#include "LogManager.h"
+#include "RGBController.h"
+
+/*-----------------------------------------------------*\
+| A4 Tech specific includes                             |
+\*-----------------------------------------------------*/
+#include "RGBController_BloodyMouse.h"
+
+/*-----------------------------------------------------*\
+| A4 Tech USB vendor ID                                 |
+\*-----------------------------------------------------*/
+#define A4_TECH_VID                                 0x09DA
+
+void DetectA4TechMouseControllers(hid_device_info* info, const std::string& name)
+{
+    hid_device* dev = hid_open_path(info->path);
+
+    if(dev)
+    {
+        BloodyMouseController* controller           = new BloodyMouseController(dev, info->path, info->product_id);
+        RGBController_BloodyMouse* rgb_controller   = new RGBController_BloodyMouse(controller);
+        rgb_controller->name                        = name;
+
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
+    }
+}
+
+REGISTER_HID_DETECTOR_IPU("Bloody W60 Pro",         DetectA4TechMouseControllers,       A4_TECH_VID,    BLOODY_W60_PRO_PID,     2,      0xFF33,     0x0529);
+REGISTER_HID_DETECTOR_IPU("Bloody MP 50RS",         DetectA4TechMouseControllers,       A4_TECH_VID,    BLOODY_MP_50RS_PID,     2,      0xFFF2,     0x6009);

Controllers/A4TechController/BloodyMouseController.cpp

@@ -0,0 +1,81 @@
+/*---------------------------------------------------------------------*\
+|  BloodyMouseController.cpp                                            |
+|                                                                       |
+|  Driver for BloodyMouse USB Controller                                |
+|                                                                       |
+|  Chris M (Dr_No)          30 Jun 2022                                 |
+|                                                                       |
+\*---------------------------------------------------------------------*/
+
+#include "BloodyMouseController.h"
+
+BloodyMouseController::BloodyMouseController(hid_device* dev_handle, const char* path, uint16_t product_id)
+{
+    dev                 = dev_handle;
+    location            = path;
+    pid                 = product_id;
+
+    InitDevice();
+}
+
+BloodyMouseController::~BloodyMouseController()
+{
+    hid_close(dev);
+}
+
+uint16_t BloodyMouseController::GetPid()
+{
+    return pid;
+}
+
+std::string BloodyMouseController::GetSerial()
+{
+    const uint8_t   sz  = HID_MAX_STR;
+    wchar_t         tmp[sz];
+
+    int ret             = hid_get_serial_number_string(dev, tmp, sz);
+
+    if (ret != 0)
+    {
+        LOG_DEBUG("[BloodyMouse] Get HID Serial string failed");
+        return("");
+    }
+
+    std::wstring w_tmp  = std::wstring(tmp);
+    std::string serial  = std::string(w_tmp.begin(), w_tmp.end());
+
+    return serial;
+}
+
+std::string BloodyMouseController::GetLocation()
+{
+    return("HID: " + location);
+}
+
+void  BloodyMouseController::InitDevice()
+{
+    uint8_t buffer[BLOODYMOUSE_WRITE_PACKET_SIZE]   = { 0x07, 0x03, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00 };
+
+    hid_send_feature_report(dev, buffer, BLOODYMOUSE_WRITE_PACKET_SIZE);
+
+    buffer[BLOODYMOUSE_MODE_BYTE]                   = 0;
+    buffer[BLOODYMOUSE_DATA_BYTE]                   = 1;
+
+    hid_send_feature_report(dev, buffer, BLOODYMOUSE_WRITE_PACKET_SIZE);
+}
+
+void  BloodyMouseController::SetLedsDirect(std::vector<RGBColor> colors)
+{
+    uint8_t buffer[BLOODYMOUSE_WRITE_PACKET_SIZE]   = { 0x07, 0x03, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00 };
+
+    for(uint8_t i = 0; i < colors.size(); i++)
+    {
+        uint8_t offset                              = 3 * (colors[i] >> 24) + BLOODYMOUSE_DATA_BYTE;
+
+        buffer[offset]                              = RGBGetRValue(colors[i]);
+        buffer[offset + 1]                          = RGBGetGValue(colors[i]);
+        buffer[offset + 2]                          = RGBGetBValue(colors[i]);
+    }
+
+    hid_send_feature_report(dev, buffer, BLOODYMOUSE_WRITE_PACKET_SIZE);
+}

Controllers/A4TechController/BloodyMouseController.h

@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------*\
+|  BloodyMouseController.h                                              |
+|                                                                       |
+|  Driver for BloodyMouse USB Controller                                |
+|                                                                       |
+|  Chris M (Dr_No)          30 Jun 2022                                 |
+|                                                                       |
+\*---------------------------------------------------------------------*/
+
+#include <string>
+#include <hidapi/hidapi.h>
+#include "LogManager.h"
+#include "RGBController.h"
+
+#pragma once
+
+/*-----------------------------------------------------*\
+| Mouse product IDs                                     |
+\*-----------------------------------------------------*/
+#define BLOODY_W60_PRO_PID                          0x37EA
+
+/*-----------------------------------------------------*\
+| Mousemat product IDs                                  |
+\*-----------------------------------------------------*/
+#define BLOODY_MP_50RS_PID                          0xFA60
+
+#define HID_MAX_STR 255
+#define BLOODYMOUSE_WRITE_PACKET_SIZE   64
+
+#define BLOODYMOUSE_BRIGHTNESS_MIN      0
+#define BLOODYMOUSE_BRIGHTNESS_MAX      255
+
+enum
+{
+    BLOODYMOUSE_MODE_DIRECT             = 0x01, //Direct Led Control - Independently set LEDs in zone
+};
+
+enum
+{
+    BLOODYMOUSE_REPORT_BYTE             = 1,
+    BLOODYMOUSE_COMMAND_BYTE            = 2,
+    BLOODYMOUSE_MODE_BYTE               = 3,
+    BLOODYMOUSE_DATA_BYTE               = 8,
+};
+
+class BloodyMouseController
+{
+public:
+    BloodyMouseController(hid_device* dev_handle, const char* path, uint16_t product_id);
+    ~BloodyMouseController();
+
+    uint16_t        GetPid();
+    std::string     GetSerial();
+    std::string     GetLocation();
+
+    void            SetLedsDirect(std::vector<RGBColor> colors);
+private:
+    uint16_t        pid;
+    std::string     location;
+    hid_device*     dev;
+
+    void            InitDevice();
+};

Controllers/A4TechController/RGBController_BloodyMouse.cpp

@@ -0,0 +1,176 @@
+/*---------------------------------------------------------------------*\
+|  RGBController_BloodyMouse.cpp                                        |
+|                                                                       |
+|  Driver for BloodyMouse USB Controller                                |
+|                                                                       |
+|  Chris M (Dr_No)          30 Jun 2022                                 |
+|                                                                       |
+\*---------------------------------------------------------------------*/
+
+#include "RGBController_BloodyMouse.h"
+
+static const mouse_layout w60_pro
+{
+    {
+        "Scroll Wheel", { 14 }
+    },
+    {
+        "Mid Line",     {  0,  1,  2,  9,  3,  4,  5,  6 }
+    },
+    {
+        "Logo",         { 10 }
+    },
+    {
+        "Rear",         {  8,  7, 13, 12, 11 }
+    }
+};
+
+static const mouse_layout mp_50rs
+{
+    {
+        "Mouse Pad",    {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9 }
+    }
+};
+
+/**------------------------------------------------------------------*\
+    @name BloodyMouse
+    @category Mouse
+    @type USB
+    @save :x:
+    @direct :white_check_mark:
+    @effects :x:
+    @detectors DetectA4TechMouseControllers
+    @comment
+\*-------------------------------------------------------------------*/
+
+RGBController_BloodyMouse::RGBController_BloodyMouse(BloodyMouseController *controller_ptr)
+{
+    controller                  = controller_ptr;
+
+    switch(controller->GetPid())
+    {
+        case BLOODY_MP_50RS_PID:
+            type                = DEVICE_TYPE_MOUSEMAT;
+            break;
+        default:
+            type                = DEVICE_TYPE_MOUSE;
+    }
+
+    name                        = "BloodyMouse";
+    vendor                      = "Bloody";
+    description                 = "Controller compatible with the Bloody W60 Pro and MP 50RS";
+    serial                      = controller->GetSerial();
+    location                    = controller->GetLocation();
+
+    mode Direct;
+    Direct.name                 = "Direct";
+    Direct.value                = BLOODYMOUSE_MODE_DIRECT;
+    Direct.flags                = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode           = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
+    SetupZones();
+}
+
+RGBController_BloodyMouse::~RGBController_BloodyMouse()
+{
+    delete controller;
+}
+
+void RGBController_BloodyMouse::SetupZones()
+{
+    /*-------------------------------------------------*\
+    | Clear any existing color/LED configuration        |
+    \*-------------------------------------------------*/
+    leds.clear();
+    colors.clear();
+
+    /*-------------------------------------------------*\
+    | Select layout from PID                            |
+    \*-------------------------------------------------*/
+    mouse_layout layout;
+    switch(controller->GetPid())
+    {
+        case BLOODY_W60_PRO_PID:
+            layout = w60_pro;
+            break;
+        case BLOODY_MP_50RS_PID:
+            layout = mp_50rs;
+            break;
+    }
+
+    /*---------------------------------------------------------*\
+    | Set up zones                                              |
+    \*---------------------------------------------------------*/
+    for(uint8_t zone_idx = 0; zone_idx < layout.size(); zone_idx++)
+    {
+        mouse_zone mz           = layout[zone_idx];
+        bool bool_single        = mz.zone_leds.size() == 1;
+
+        zone new_zone;
+        new_zone.name           = mz.name;
+        new_zone.leds_min       = mz.zone_leds.size();
+        new_zone.leds_max       = new_zone.leds_min;
+        new_zone.leds_count     = new_zone.leds_min;
+        new_zone.type           = bool_single ? ZONE_TYPE_SINGLE : ZONE_TYPE_LINEAR;
+        new_zone.matrix_map     = NULL;
+        zones.push_back(new_zone);
+
+        for(unsigned int lp_idx = 0; lp_idx < zones[zone_idx].leds_count; lp_idx++)
+        {
+            led new_led;
+
+            new_led.value       = mz.zone_leds[lp_idx];
+
+            if(bool_single)
+            {
+                new_led.name    = mz.name + " LED";
+            }
+            else
+            {
+                new_led.name    = mz.name;
+                new_led.name.append(" LED " + std::to_string(lp_idx));
+            }
+
+            leds.push_back(new_led);
+        }
+    }
+
+    SetupColors();
+}
+
+void RGBController_BloodyMouse::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_BloodyMouse::DeviceUpdateLEDs()
+{
+    std::vector<RGBColor> colour;
+    for(size_t i = 0; i < colors.size(); i++)
+    {
+        RGBColor c = colors[i] | (leds[i].value << 24);
+        colour.push_back(c);
+    }
+
+    controller->SetLedsDirect(colour);
+}
+
+void RGBController_BloodyMouse::UpdateZoneLEDs(int /*zone*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_BloodyMouse::UpdateSingleLED(int /*led*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_BloodyMouse::DeviceUpdateMode()
+{
+    /*---------------------------------------------------------*\
+    | This device only supports Direct mode                     |
+    \*---------------------------------------------------------*/
+}

Controllers/A4TechController/RGBController_BloodyMouse.h

@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------*\
+|  RGBController_BloodyMouse.h                                          |
+|                                                                       |
+|  Driver for BloodyMouse USB Controller                                |
+|                                                                       |
+|  Chris M (Dr_No)          30 Jun 2022                                 |
+|                                                                       |
+\*---------------------------------------------------------------------*/
+
+#pragma once
+#include <vector>
+#include "LogManager.h"
+#include "RGBController.h"
+#include "BloodyMouseController.h"
+
+struct mouse_zone
+{
+    std::string             name;
+    std::vector<uint8_t>    zone_leds;
+};
+
+typedef std::vector<mouse_zone> mouse_layout;
+
+class RGBController_BloodyMouse : public RGBController
+{
+public:
+    RGBController_BloodyMouse(BloodyMouseController* controller_ptr);
+    ~RGBController_BloodyMouse();
+
+    void                    SetupZones();
+    void                    ResizeZone(int zone, int new_size);
+
+    void                    DeviceUpdateLEDs();
+    void                    UpdateZoneLEDs(int zone);
+    void                    UpdateSingleLED(int led);
+
+    void                    DeviceUpdateMode();
+
+private:
+    BloodyMouseController*  controller;
+};

Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp

@@ -11,10 +11,11 @@
 
 /**------------------------------------------------------------------*\
     @name AMD Wraith Prism
+    @category Cooler
     @type USB
-    @save :x:
+    @save :o:
     @direct :white_check_mark:
-    @effects :warning:
+    @effects :tools:
     @detectors DetectAMDWraithPrismControllers
     @comment The Wraith Prism comes with 2 cables but is only detectable
         and controlable when using the USB cable. `Morse Code` and `Mirage`
@@ -62,7 +63,7 @@ RGBController_AMDWraithPrism::RGBController_AMDWraithPrism(AMDWraithPrismControl
     modes.push_back(Breathing);
 
     mode ColorCycle;
-    ColorCycle.name             = "Color Cycle";
+    ColorCycle.name             = "Spectrum Cycle";
     ColorCycle.value            = AMD_WRAITH_PRISM_EFFECT_CHANNEL_COLOR_CYCLE;
     ColorCycle.flags            = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS;
     ColorCycle.speed_min        = AMD_WRAITH_PRISM_SPEED_SLOWEST;
@@ -75,7 +76,7 @@ RGBController_AMDWraithPrism::RGBController_AMDWraithPrism(AMDWraithPrismControl
     modes.push_back(ColorCycle);
 
     mode Rainbow;
-    Rainbow.name                = "Rainbow";
+    Rainbow.name                = "Rainbow Wave";
     Rainbow.value               = AMD_WRAITH_PRISM_EFFECT_CHANNEL_RAINBOW;
     Rainbow.flags               = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS;
     Rainbow.speed_min           = AMD_WRAITH_PRISM_SPEED_SLOWEST;
@@ -235,11 +236,6 @@ void RGBController_AMDWraithPrism::UpdateSingleLED(int led)
     UpdateZoneLEDs(led);
 }
 
-void RGBController_AMDWraithPrism::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_AMDWraithPrism::DeviceUpdateMode()
 {
     bool random = (modes[active_mode].color_mode == MODE_COLORS_RANDOM);
@@ -258,7 +254,7 @@ void RGBController_AMDWraithPrism::DeviceUpdateMode()
             controller->SetFanMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_COLOR_CYCLE, modes[active_mode].speed, (modes[active_mode].brightness >> 1), random);
             controller->SetLogoMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_COLOR_CYCLE, modes[active_mode].speed, (modes[active_mode].brightness >> 1), random);
             break;
-        
+
         case AMD_WRAITH_PRISM_EFFECT_CHANNEL_BREATHING:
             controller->SetFanMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_BREATHING, modes[active_mode].speed, modes[active_mode].brightness, random);
             controller->SetLogoMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_BREATHING, modes[active_mode].speed, modes[active_mode].brightness, random);

Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.h

@@ -25,7 +25,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:

Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.cpp

@@ -1,353 +0,0 @@
-/*-----------------------------------------*\
-|  ASRockPolychromeSMBusController.cpp      |
-|                                           |
-|  Driver for for ASRock ASR LED and        |
-|  Polychrome RGB lighting controller       |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/14/2019  |
-\*-----------------------------------------*/
-
-#include "ASRockPolychromeSMBusController.h"
-#include <cstring>
-#include "dependencies/dmiinfo.h"
-#include "LogManager.h"
-
-#define ASROCK_ZONE_LED_COUNT_MESSAGE_EN    "[%s] Zone %i LED count: %02d"
-
-using namespace std::chrono_literals;
-
-PolychromeController::PolychromeController(i2c_smbus_interface* bus, polychrome_dev_id dev)
-{
-    this->bus = bus;
-    this->dev = dev;
-
-    DMIInfo dmi;
-
-    device_name =   "ASRock " + dmi.getMainboard();
-    fw_version =    ReadFirmwareVersion();
-    unsigned char   major_version = fw_version >> 8;
-
-    /*-----------------------------------------------------*\
-    | Determine whether the device uses ASR LED or          |
-    | Polychrome protocol by checking firmware version.     |
-    | Versions: 1.xx are ASR RGB LED                        |
-    |           2.xx are Polychrome v1                      |
-    |           3.xx are Polychrome v2                      |
-    \*-----------------------------------------------------*/
-    switch(major_version)
-    {
-        case ASROCK_TYPE_ASRLED:
-            LOG_TRACE("[%s] Device type is ASR RGB LED", ASROCK_CONTROLLER_NAME);
-            asrock_type = ASROCK_TYPE_ASRLED;
-            memset(zone_led_count, 0, sizeof(zone_led_count));
-            break;
-
-        case ASROCK_TYPE_POLYCHROME_V1:
-            LOG_TRACE("[%s] Device type is Polychrome v1", ASROCK_CONTROLLER_NAME);
-            asrock_type = ASROCK_TYPE_POLYCHROME_V1;
-            ReadLEDConfiguration();
-            break;
-
-        case ASROCK_TYPE_POLYCHROME_V2:
-            LOG_TRACE("[%s] Device type is Polychrome v2", ASROCK_CONTROLLER_NAME);
-            asrock_type = ASROCK_TYPE_POLYCHROME_V2;
-            ReadLEDConfiguration();
-            break;
-
-        default:
-            LOG_TRACE("[%s] Got Unknown version!", ASROCK_CONTROLLER_NAME);
-            asrock_type = ASROCK_TYPE_UNKNOWN;
-            break;
-    }
-}
-
-PolychromeController::~PolychromeController()
-{
-
-}
-
-unsigned int PolychromeController::GetASRockType()
-{
-    return(asrock_type);
-}
-
-std::string PolychromeController::GetDeviceLocation()
-{
-    std::string return_string(bus->device_name);
-    char addr[5];
-    snprintf(addr, 5, "0x%02X", dev);
-    return_string.append(", address ");
-    return_string.append(addr);
-    return("I2C: " + return_string);
-}
-
-std::string PolychromeController::GetDeviceName()
-{
-    return(device_name);
-}
-
-std::string PolychromeController::GetFirmwareVersion()
-{
-    unsigned char  major_version = fw_version >> 8;
-    unsigned char  minor_version = fw_version & 0xFF;
-
-    return(std::to_string(major_version) + "." + std::to_string(minor_version));
-}
-
-unsigned short PolychromeController::ReadFirmwareVersion()
-{
-    // The firmware register holds two bytes, so the first read should return 2
-    // If not, report invalid firmware revision FFFF
-    LOG_DEBUG("[%s] Reading back device firmware version", ASROCK_CONTROLLER_NAME);
-    // Version response array needs to be 32 bytes to prevent non ASRock board from stack smashing
-    unsigned char asrock_version[I2C_SMBUS_BLOCK_MAX] = { 0x00, 0x00 };
-    if (bus->i2c_smbus_read_block_data(dev, ASROCK_REG_FIRMWARE_VER, asrock_version) == 0x02)
-    {
-        unsigned char major = asrock_version[0];
-        unsigned char minor = asrock_version[1];
-
-        LOG_DEBUG("[%s] Device firmware version: v%02d.%02d", ASROCK_CONTROLLER_NAME, major, minor);
-        return((major << 8) | minor);
-    }
-    else
-    {
-        LOG_WARNING("[%s] Firmware readback failed; Returning 0xFFFF", ASROCK_CONTROLLER_NAME);
-        return(0xFFFF);
-    }
-}
-
-void PolychromeController::ReadLEDConfiguration()
-{
-    /*---------------------------------------------------------------------------------*\
-    | The LED configuration register holds 6 bytes, so the first read should return 6   |
-    | If not, set all zone sizes to zero                                                |
-    \*---------------------------------------------------------------------------------*/
-    LOG_DEBUG("[%s] Reading LED config from controller", ASROCK_CONTROLLER_NAME);
-    unsigned char asrock_zone_count[I2C_SMBUS_BLOCK_MAX] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 };
-    if (bus->i2c_smbus_read_block_data(dev, POLYCHROME_REG_LED_CONFIG, asrock_zone_count) == 0x06)
-    {
-        zone_led_count[POLYCHROME_ZONE_1]           = asrock_zone_count[0];
-        zone_led_count[POLYCHROME_ZONE_2]           = asrock_zone_count[1];
-        zone_led_count[POLYCHROME_ZONE_3]           = asrock_zone_count[2];
-        zone_led_count[POLYCHROME_ZONE_4]           = asrock_zone_count[3];
-        zone_led_count[POLYCHROME_ZONE_5]           = asrock_zone_count[4];
-        zone_led_count[POLYCHROME_ZONE_ADDRESSABLE] = asrock_zone_count[5];
-        LOG_DEBUG(ASROCK_ZONE_LED_COUNT_MESSAGE_EN, ASROCK_CONTROLLER_NAME, POLYCHROME_ZONE_1, zone_led_count[POLYCHROME_ZONE_1]);
-        LOG_DEBUG(ASROCK_ZONE_LED_COUNT_MESSAGE_EN, ASROCK_CONTROLLER_NAME, POLYCHROME_ZONE_2, zone_led_count[POLYCHROME_ZONE_2]);
-        LOG_DEBUG(ASROCK_ZONE_LED_COUNT_MESSAGE_EN, ASROCK_CONTROLLER_NAME, POLYCHROME_ZONE_3, zone_led_count[POLYCHROME_ZONE_3]);
-        LOG_DEBUG(ASROCK_ZONE_LED_COUNT_MESSAGE_EN, ASROCK_CONTROLLER_NAME, POLYCHROME_ZONE_4, zone_led_count[POLYCHROME_ZONE_4]);
-        LOG_DEBUG(ASROCK_ZONE_LED_COUNT_MESSAGE_EN, ASROCK_CONTROLLER_NAME, POLYCHROME_ZONE_5, zone_led_count[POLYCHROME_ZONE_5]);
-        LOG_DEBUG("[%s] Addressable Zone LED count: %02d", ASROCK_CONTROLLER_NAME, zone_led_count[POLYCHROME_ZONE_ADDRESSABLE]);
-    }
-    else
-    {
-        LOG_WARNING("[%s] LED config read failed", ASROCK_CONTROLLER_NAME);
-        memset(zone_led_count, 0, sizeof(zone_led_count));
-    }
-}
-
-unsigned int PolychromeController::GetMode()
-{
-    return(active_mode);
-}
-
-void PolychromeController::SetColorsAndSpeed(unsigned char led, unsigned char red, unsigned char green, unsigned char blue)
-{
-    unsigned char color_speed_pkt[4] = { red, green, blue, active_speed };
-    unsigned char select_led_pkt[1]  = { led };
-    
-    switch(asrock_type)
-    {
-        case ASROCK_TYPE_ASRLED:
-            /*-----------------------------------------------------*\
-            | Select LED                                            |
-            \*-----------------------------------------------------*/
-            if(active_mode != ASRLED_MODE_OFF)
-            {
-                bus->i2c_smbus_write_block_data(dev, ASROCK_REG_LED_SELECT, 1, select_led_pkt);
-                std::this_thread::sleep_for(1ms);
-            }
-
-            switch(active_mode)
-            {
-                /*-----------------------------------------------------*\
-                | These modes take 4 bytes in R/G/B/S order             |
-                \*-----------------------------------------------------*/
-                case ASRLED_MODE_BREATHING:
-                case ASRLED_MODE_STROBE:
-                case ASRLED_MODE_SPECTRUM_CYCLE:
-                    bus->i2c_smbus_write_block_data(dev, active_mode, 4, color_speed_pkt);
-                    break;
-
-                /*-----------------------------------------------------*\
-                | These modes take 3 bytes in R/G/B order               |
-                \*-----------------------------------------------------*/
-                default:
-                case ASRLED_MODE_STATIC:
-                case ASRLED_MODE_MUSIC:
-                    bus->i2c_smbus_write_block_data(dev, active_mode, 3, color_speed_pkt);
-                    break;
-
-                /*-----------------------------------------------------*\
-                | These modes take 1 byte - speed                       |
-                \*-----------------------------------------------------*/
-                case ASRLED_MODE_RANDOM:
-                case ASRLED_MODE_WAVE:
-                    bus->i2c_smbus_write_block_data(dev, active_mode, 1, &active_speed);
-                    break;
-
-                /*-----------------------------------------------------*\
-                | These modes take no bytes                             |
-                \*-----------------------------------------------------*/
-                case ASRLED_MODE_OFF:
-                    break;
-            }
-            std::this_thread::sleep_for(1ms);
-            break;
-
-        case ASROCK_TYPE_POLYCHROME_V1:
-            /*-----------------------------------------------------*\
-            | Select LED                                            |
-            \*-----------------------------------------------------*/
-            if(active_mode != ASRLED_MODE_OFF)
-            {
-                bus->i2c_smbus_write_block_data(dev, ASROCK_REG_LED_SELECT, 1, select_led_pkt);
-                std::this_thread::sleep_for(1ms);
-            }
-
-            switch(active_mode)
-            {
-                /*-----------------------------------------------------*\
-                | These modes take 4 bytes in R/G/B/S order             |
-                \*-----------------------------------------------------*/
-                case POLYCHROME_V1_MODE_BREATHING:
-                case POLYCHROME_V1_MODE_STROBE:
-                case POLYCHROME_V1_MODE_SPECTRUM_CYCLE:
-                case POLYCHROME_V1_MODE_SPRING:
-                case POLYCHROME_V1_MODE_METEOR:
-                case POLYCHROME_V1_MODE_STACK:
-                case POLYCHROME_V1_MODE_CRAM:
-                case POLYCHROME_V1_MODE_SCAN:
-                case POLYCHROME_V1_MODE_NEON:
-                case POLYCHROME_V1_MODE_WATER:
-
-                    bus->i2c_smbus_write_block_data(dev, active_mode, 4, color_speed_pkt);
-                    break;
-
-                /*-----------------------------------------------------*\
-                | These modes take 3 bytes in R/G/B order               |
-                \*-----------------------------------------------------*/
-                default:
-                case POLYCHROME_V1_MODE_STATIC:
-                case POLYCHROME_V1_MODE_MUSIC:
-                    bus->i2c_smbus_write_block_data(dev, active_mode, 3, color_speed_pkt);
-                    break;
-
-                /*-----------------------------------------------------*\
-                | These modes take 1 byte - speed                       |
-                \*-----------------------------------------------------*/
-                case POLYCHROME_V1_MODE_RANDOM:
-                case POLYCHROME_V1_MODE_WAVE:
-                case POLYCHROME_V1_MODE_RAINBOW:
-                    bus->i2c_smbus_write_block_data(dev, active_mode, 1, &active_speed);
-                    break;
-
-                /*-----------------------------------------------------*\
-                | These modes take no bytes                             |
-                \*-----------------------------------------------------*/
-                case POLYCHROME_V1_MODE_OFF:
-                    break;
-            }
-            std::this_thread::sleep_for(1ms);
-            break;
-
-        case ASROCK_TYPE_POLYCHROME_V2:
-            /*-----------------------------------------------------*\
-            | Select LED                                            |
-            \*-----------------------------------------------------*/
-            switch(active_mode)
-            {
-                case POLYCHROME_V2_MODE_OFF:
-                case POLYCHROME_V2_MODE_RAINBOW:
-                case POLYCHROME_V2_MODE_SPECTRUM_CYCLE:
-                    break;
-
-                default:
-                    bus->i2c_smbus_write_block_data(dev, ASROCK_REG_LED_SELECT, 1, select_led_pkt);
-                    std::this_thread::sleep_for(1ms);
-
-                    /*-----------------------------------------------------*\
-                    | Polychrome firmware always writes color to fixed reg  |
-                    \*-----------------------------------------------------*/
-                    bus->i2c_smbus_write_block_data(dev, POLYCHROME_V2_REG_COLOR, 3, color_speed_pkt);
-                    std::this_thread::sleep_for(1ms);
-                    break;
-            }
-            break;
-    }
-}
-
-void PolychromeController::SetMode(unsigned char zone,unsigned char mode, unsigned char speed)
-{
-    unsigned char led_count_pkt[1]  = { 0x00 };
-    active_zone                     = zone;
-    active_mode                     = mode;
-    active_speed                    = speed;
-
-    switch(asrock_type)
-    {
-        case ASROCK_TYPE_ASRLED:
-            bus->i2c_smbus_write_block_data(dev, ASROCK_REG_MODE, 1, &active_mode);
-            std::this_thread::sleep_for(1ms);
-            break;
-
-        case ASROCK_TYPE_POLYCHROME_V1:
-            /*-----------------------------------------------------*\
-            | Make sure set all register is set to 0                |
-            \*-----------------------------------------------------*/
-            bus->i2c_smbus_write_block_data(dev, POLYCHROME_V1_REG_SET_ALL, 1, led_count_pkt);
-            std::this_thread::sleep_for(1ms);
-
-            /*-----------------------------------------------------*\
-            | Set the zone we are working on                        |
-            \*-----------------------------------------------------*/
-            bus->i2c_smbus_write_block_data(dev, ASROCK_REG_LED_SELECT, 1, &active_zone);
-            std::this_thread::sleep_for(1ms);
-
-            /*-----------------------------------------------------*\
-            | Write the mode                                        |
-            \*-----------------------------------------------------*/
-            bus->i2c_smbus_write_block_data(dev, ASROCK_REG_MODE, 1, &active_mode);
-            std::this_thread::sleep_for(1ms);
-            break;
-
-        case ASROCK_TYPE_POLYCHROME_V2:
-            bus->i2c_smbus_write_block_data(dev, ASROCK_REG_MODE, 1, &active_mode);
-            std::this_thread::sleep_for(1ms);
-
-            /*-----------------------------------------------------*\
-            | Select a single LED                                   |
-            \*-----------------------------------------------------*/
-            bus->i2c_smbus_write_block_data(dev, POLYCHROME_V2_REG_LED_COUNT, 0, led_count_pkt);
-            std::this_thread::sleep_for(1ms);
-
-            switch(active_mode)
-            {
-                /*-----------------------------------------------------*\
-                | These modes don't take a speed                        |
-                \*-----------------------------------------------------*/
-                case POLYCHROME_V2_MODE_OFF:
-                case POLYCHROME_V2_MODE_STATIC:
-                    break;
-
-                /*-----------------------------------------------------*\
-                | All other modes, write speed to active mode register  |
-                \*-----------------------------------------------------*/
-                default:
-                    bus->i2c_smbus_write_block_data(dev, active_mode, 1, &speed);
-                    std::this_thread::sleep_for(1ms);
-                    break;
-            }
-            break;
-    }    
-}

Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.h

@@ -1,271 +0,0 @@
-/*-----------------------------------------*\
-|  ASRockPolychromeSMBusController.h        |
-|                                           |
-|  Definitions and types for ASRock         |
-|  ASR LED and Polychrome RGB lighting      |
-|  controller                               |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/13/2019  |
-\*-----------------------------------------*/
-
-#include "i2c_smbus.h"
-#include <string>
-
-#pragma once
-
-typedef unsigned char	polychrome_dev_id;
-
-#define ASROCK_CONTROLLER_NAME  "ASRock Polychrome SMBus Controller"
-#define ASROCK_DETECTOR_NAME    "ASRock Polychrome SMBus Detect"
-#define VENDOR_NAME             "ASRock"
-#define SMBUS_ADDRESS           0x6A
-
-enum
-{
-    ASROCK_TYPE_UNKNOWN                     = 0x00,     /* Unknown Type or Not ASRock Device    */
-    ASROCK_TYPE_ASRLED                      = 0x01,     /* ASRock Firmware 1.x - ASR LED        */
-    ASROCK_TYPE_POLYCHROME_V1               = 0x02,     /* ASRock Firmware 2.x - Polychrome V1  */
-    ASROCK_TYPE_POLYCHROME_V2               = 0x03,     /* ASRock Firmware 3.x - Polychrome V2  */
-};
-
-enum
-{
-    /*------------------------------------------------------------------------------------------*\
-    | ASRock Common Registers                                                                    |
-    \*------------------------------------------------------------------------------------------*/
-    ASROCK_REG_FIRMWARE_VER                 = 0x00,     /* Firmware version Major.Minor         */
-    ASROCK_REG_MODE                         = 0x30,     /* Mode selection register              */
-    ASROCK_REG_LED_SELECT                   = 0x31,     /* LED selection register               */
-    /*------------------------------------------------------------------------------------------*\
-    | ASRock Polychrome V1/V2 Common Registers                                                   |
-    \*------------------------------------------------------------------------------------------*/
-    POLYCHROME_REG_LED_CONFIG               = 0x33,     /* LED configuration register           */
-    /*------------------------------------------------------------------------------------------*\
-    | ASRock Polychrome V1 (Firmware 2.x) Registers                                              |
-    \*------------------------------------------------------------------------------------------*/
-    POLYCHROME_V1_REG_SET_ALL               = 0x32,     /* Set All register 0x1 = set all       */
-    POLYCHROME_V1_REG_ARGB_GRB              = 0x35,     /* ARGB bistream reversing register     */
-    /*------------------------------------------------------------------------------------------*\
-    | ASRock Polychrome V2 (Firmware 3.x) Registers                                              |
-    \*------------------------------------------------------------------------------------------*/
-    POLYCHROME_V2_REG_LED_COUNT             = 0x32,     /* Additional LED count register        */
-    POLYCHROME_V2_REG_COLOR                 = 0x34,     /* Color register: Red, Green, Blue     */
-    POLYCHROME_V2_REG_ARGB_GRB              = 0x35,     /* ARGB bistream reversing register     */
-};
-
-enum
-{
-    POLYCHROME_ZONE_1                       = 0x00,     /* RGB LED 1 Header                     */
-    POLYCHROME_ZONE_2                       = 0x01,     /* RGB LED 2 Header                     */
-    POLYCHROME_ZONE_3                       = 0x02,     /* Audio/PCH Zone LEDs                  */
-    POLYCHROME_ZONE_4                       = 0x03,     /* Audio/PCH Zone LEDs                  */
-    POLYCHROME_ZONE_5                       = 0x04,     /* IO Cover Zone LEDs                   */
-    POLYCHROME_ZONE_ADDRESSABLE             = 0x05,     /* Addressable LED header               */
-    POLYCHROME_ZONE_COUNT                   = 0x06,     /* Total number of zones                */
-    POLYCHROME_ZONE_ADDRESSABLE_MAX         = 0x64,     /* Maxinum number of ARGB LEDs          */
-};
-
-/*----------------------------------------------------------------------------------------------*\
-| Definitions for ASR LED                                                                        |
-\*----------------------------------------------------------------------------------------------*/
-#define ASRLED_NUM_MODES                    8           /* Number of ASR LED modes              */
-
-enum
-{
-    ASRLED_MODE_OFF                         = 0x10,     /* OFF mode                             */
-    ASRLED_MODE_STATIC                      = 0x11,     /* Static color mode                    */
-    ASRLED_MODE_BREATHING                   = 0x12,     /* Breathing effect mode                */
-    ASRLED_MODE_STROBE                      = 0x13,     /* Strobe effect mode                   */
-    ASRLED_MODE_SPECTRUM_CYCLE              = 0x14,     /* Spectrum Cycle effect mode           */
-    ASRLED_MODE_RANDOM                      = 0x15,     /* Random effect mode                   */
-    ASRLED_MODE_MUSIC                       = 0x17,     /* Music effect mode                    */
-    ASRLED_MODE_WAVE                        = 0x18,     /* Wave effect mode                     */
-};
-
-enum
-{
-    ASRLED_SPEED_MIN                        = 0x05,     /* Slowest speed                        */
-    ASRLED_SPEED_DEFAULT                    = 0x03,     /* Default speed                        */
-    ASRLED_SPEED_MAX                        = 0x00,     /* Fastest speed                        */
-};
-
-/*----------------------------------------------------------------------------------------------*\
-| Definitions for Polychrome V1                                                                  |
-\*----------------------------------------------------------------------------------------------*/
-#define POLYCHROME_V1_NUM_MODES             16          /* Number of Polychrome V1 modes        */
-
-enum
-{
-    POLYCHROME_V1_MODE_OFF                  = 0x10,     /* OFF mode                             */
-    POLYCHROME_V1_MODE_STATIC               = 0x11,     /* Static color mode                    */
-    POLYCHROME_V1_MODE_BREATHING            = 0x12,     /* Breating effect mode                 */
-    POLYCHROME_V1_MODE_STROBE               = 0x13,     /* Strobe effect mode                   */
-    POLYCHROME_V1_MODE_SPECTRUM_CYCLE       = 0x14,     /* Spectrum Cycle effect mode           */
-    POLYCHROME_V1_MODE_RANDOM               = 0x15,     /* Random effect mode                   */
-    POLYCHROME_V1_MODE_MUSIC                = 0x17,     /* Music effect mode                    */
-    POLYCHROME_V1_MODE_WAVE                 = 0x18,     /* Wave effect mode                     */
-    /*------------------------------------------------------------------------------------------*\
-    | Modes only available on ARGB headers                                                       |
-    \*------------------------------------------------------------------------------------------*/
-    POLYCHROME_V1_MODE_SPRING               = 0x19,     /* Spring effect mode                   */
-    POLYCHROME_V1_MODE_METEOR               = 0x1A,     /* Meteor effect mode                   */
-    POLYCHROME_V1_MODE_STACK                = 0x1B,     /* Stack effect mode                    */
-    POLYCHROME_V1_MODE_CRAM                 = 0x1C,     /* Cram effect mode                     */
-    POLYCHROME_V1_MODE_SCAN                 = 0x1D,     /* Scan effect mode                     */
-    POLYCHROME_V1_MODE_NEON                 = 0x1E,     /* Neon effect mode                     */
-    POLYCHROME_V1_MODE_WATER                = 0x1F,     /* Water effect mode                    */
-    POLYCHROME_V1_MODE_RAINBOW              = 0x20,     /* Rainbow chase effect mode            */
-};
-
-enum
-{
-    /*------------------------------------------------------------------------------------------*\
-    | POLYCHROME_V1_MODE_BREATHING                                                               |
-    \*------------------------------------------------------------------------------------------*/
-    POLYCHROME_V1_SPEED_MIN_BREATHING       = 0x0A,     /* Slowest speed                        */
-    POLYCHROME_V1_SPEED_DEFAULT_BREATHING   = 0x02,     /* Default speed                        */
-    POLYCHROME_V1_SPEED_MAX_BREATHING       = 0x02,     /* Fastest speed                        */
-    /*------------------------------------------------------------------------------------------*\
-    | POLYCHROME_V1_MODE_STROBE                                                                  |
-    \*------------------------------------------------------------------------------------------*/
-    POLYCHROME_V1_SPEED_MIN_STROBE          = 0xA0,     /* Slowest speed                        */
-    POLYCHROME_V1_SPEED_DEFAULT_STROBE      = 0x14,     /* Default speed                        */
-    POLYCHROME_V1_SPEED_MAX_STROBE          = 0x05,     /* Fastest speed                        */
-    /*------------------------------------------------------------------------------------------*\
-    | POLYCHROME_V1_MODE_SPECTRUM_CYCLE                                                          |
-    \*------------------------------------------------------------------------------------------*/
-    POLYCHROME_V1_SPEED_MIN_CYCLE           = 0xA0,     /* Slowest speed                        */
-    POLYCHROME_V1_SPEED_DEFAULT_CYCLE       = 0x14,     /* Default speed                        */
-    POLYCHROME_V1_SPEED_MAX_CYCLE           = 0x0A,     /* Fastest speed                        */
-    /*------------------------------------------------------------------------------------------*\
-    | POLYCHROME_V1_MODE_RANDOM                                                                  |
-    \*------------------------------------------------------------------------------------------*/
-    POLYCHROME_V1_SPEED_MIN_RANDOM          = 0xA0,     /* Slowest speed                        */
-    POLYCHROME_V1_SPEED_DEFAULT_RANDOM      = 0x28,     /* Default speed                        */
-    POLYCHROME_V1_SPEED_MAX_RANDOM          = 0x05,     /* Fastest speed                        */
-    /*------------------------------------------------------------------------------------------*\
-    | POLYCHROME_V1_MODE_WAVE                                                                    |
-    \*------------------------------------------------------------------------------------------*/
-    POLYCHROME_V1_SPEED_MIN_WAVE            = 0x06,     /* Slowest speed                        */
-    POLYCHROME_V1_SPEED_DEFAULT_WAVE        = 0x02,     /* Default speed                        */
-    POLYCHROME_V1_SPEED_MAX_WAVE            = 0x01,     /* Fastest speed                        */
-    POLYCHROME_V1_SPEED_DEFAULT_SPRING      = 0x04,     /* Default speed                        */
-    POLYCHROME_V1_SPEED_DEFAULT_METEOR      = 0x0A,     /* Default speed                        */
-    POLYCHROME_V1_SPEED_DEFAULT_STACK       = 0x04,     /* Default speed                        */
-    POLYCHROME_V1_SPEED_DEFAULT_CRAM        = 0x04,     /* Default speed                        */
-    POLYCHROME_V1_SPEED_DEFAULT_SCAN        = 0x0A,     /* Default speed                        */
-    POLYCHROME_V1_SPEED_DEFAULT_NEON        = 0x20,     /* Default speed                        */
-    POLYCHROME_V1_SPEED_DEFAULT_WATER       = 0x0A,     /* Default speed                        */
-    /*------------------------------------------------------------------------------------------*\
-    | POLYCHROME_V1_MODE_RAINBOW                                                                 |
-    \*------------------------------------------------------------------------------------------*/
-    POLYCHROME_V1_SPEED_MIN_RAINBOW         = 0x12,     /* Slowest speed                        */
-    POLYCHROME_V1_SPEED_DEFAULT_RAINBOW     = 0x0A,     /* Default speed                        */
-    POLYCHROME_V1_SPEED_MAX_RAINBOW         = 0x01,     /* Fastest speed                        */
-    POLYCHROME_V1_SPEED_MIN_ARGB            = 0x20,     /* Slowest speed                        */
-    POLYCHROME_V1_SPEED_MAX_ARGB            = 0x02,     /* Fastest speed                        */
-};
-
-/*----------------------------------------------------------------------------------------------*\
-| Definitions for Polychrome V2                                                                  |
-\*----------------------------------------------------------------------------------------------*/
-#define POLYCHROME_V2_NUM_MODES             14          /* Number of Polychrome V2 modes        */
-
-enum
-{
-    POLYCHROME_V2_MODE_OFF                  = 0x10,     /* OFF mode                             */
-    POLYCHROME_V2_MODE_STATIC               = 0x11,     /* Static color mode                    */
-    POLYCHROME_V2_MODE_BREATHING            = 0x12,     /* Breating effect mode                 */
-    POLYCHROME_V2_MODE_STROBE               = 0x13,     /* Strobe effect mode                   */
-    POLYCHROME_V2_MODE_SPECTRUM_CYCLE       = 0x14,     /* Spectrum Cycle effect mode           */
-    POLYCHROME_V2_MODE_RANDOM               = 0x15,     /* Random effect mode                   */
-    POLYCHROME_V2_MODE_WAVE                 = 0x17,     /* Wave effect mode                     */
-    POLYCHROME_V2_MODE_SPRING               = 0x18,     /* Spring effect mode                   */
-    POLYCHROME_V2_MODE_STACK                = 0x19,     /* Stack effect mode                    */
-    POLYCHROME_V2_MODE_CRAM                 = 0x1A,     /* Cram effect mode                     */
-    POLYCHROME_V2_MODE_SCAN                 = 0x1B,     /* Scan effect mode                     */
-    POLYCHROME_V2_MODE_NEON                 = 0x1C,     /* Neon effect mode                     */
-    POLYCHROME_V2_MODE_WATER                = 0x1D,     /* Water effect mode                    */
-    POLYCHROME_V2_MODE_RAINBOW              = 0x1E,     /* Rainbow effect mode                  */
-};
-
-enum
-{
-    POLYCHROME_V2_BREATHING_SPEED_MIN               = 0x0A,     /* Slowest speed                        */
-    POLYCHROME_V2_BREATHING_SPEED_DEFAULT           = 0x06,     /* Default speed                        */
-    POLYCHROME_V2_BREATHING_SPEED_MAX               = 0x02,     /* Fastest speed                        */
-
-    POLYCHROME_V2_STROBE_SPEED_MIN                  = 0xA0,     /* Slowest speed                        */
-    POLYCHROME_V2_STROBE_SPEED_DEFAULT              = 0x4D,     /* Default speed                        */
-    POLYCHROME_V2_STROBE_SPEED_MAX                  = 0x05,     /* Fastest speed                        */
-
-    POLYCHROME_V2_SPECTRUM_CYCLE_SPEED_MIN          = 0xA0,     /* Slowest speed                        */
-    POLYCHROME_V2_SPECTRUM_CYCLE_SPEED_DEFAULT      = 0x50,     /* Default speed                        */
-    POLYCHROME_V2_SPECTRUM_CYCLE_SPEED_MAX          = 0x0A,     /* Fastest speed                        */
-
-    POLYCHROME_V2_RANDOM_SPEED_MIN                  = 0xA0,     /* Slowest speed                        */
-    POLYCHROME_V2_RANDOM_SPEED_DEFAULT              = 0x4D,     /* Default speed                        */
-    POLYCHROME_V2_RANDOM_SPEED_MAX                  = 0x05,     /* Fastest speed                        */
-
-    POLYCHROME_V2_WAVE_SPEED_MIN                    = 0x06,     /* Slowest speed                        */
-    POLYCHROME_V2_WAVE_SPEED_DEFAULT                = 0x03,     /* Default speed                        */
-    POLYCHROME_V2_WAVE_SPEED_MAX                    = 0x01,     /* Fastest speed                        */
-
-    POLYCHROME_V2_SPRING_SPEED_MIN                  = 0x20,     /* Slowest speed                        */
-    POLYCHROME_V2_SPRING_SPEED_DEFAULT              = 0x11,     /* Default speed                        */
-    POLYCHROME_V2_SPRING_SPEED_MAX                  = 0x02,     /* Fastest speed                        */
-
-    POLYCHROME_V2_STACK_SPEED_MIN                   = 0x20,     /* Slowest speed                        */
-    POLYCHROME_V2_STACK_SPEED_DEFAULT               = 0x11,     /* Default speed                        */
-    POLYCHROME_V2_STACK_SPEED_MAX                   = 0x02,     /* Fastest speed                        */
-
-    POLYCHROME_V2_CRAM_SPEED_MIN                    = 0x20,     /* Slowest speed                        */
-    POLYCHROME_V2_CRAM_SPEED_DEFAULT                = 0x11,     /* Default speed                        */
-    POLYCHROME_V2_CRAM_SPEED_MAX                    = 0x02,     /* Fastest speed                        */
-
-    POLYCHROME_V2_SCAN_SPEED_MIN                    = 0x20,     /* Slowest speed                        */
-    POLYCHROME_V2_SCAN_SPEED_DEFAULT                = 0x11,     /* Default speed                        */
-    POLYCHROME_V2_SCAN_SPEED_MAX                    = 0x02,     /* Fastest speed                        */
-
-    POLYCHROME_V2_NEON_SPEED_MIN                    = 0x20,     /* Slowest speed                        */
-    POLYCHROME_V2_NEON_SPEED_DEFAULT                = 0x11,     /* Default speed                        */
-    POLYCHROME_V2_NEON_SPEED_MAX                    = 0x02,     /* Fastest speed                        */
-
-    POLYCHROME_V2_WATER_SPEED_MIN                   = 0x20,     /* Slowest speed                        */
-    POLYCHROME_V2_WATER_SPEED_DEFAULT               = 0x11,     /* Default speed                        */
-    POLYCHROME_V2_WATER_SPEED_MAX                   = 0x02,     /* Fastest speed                        */
-
-    POLYCHROME_V2_RAINBOW_SPEED_MIN                 = 0x12,     /* Slowest speed                        */
-    POLYCHROME_V2_RAINBOW_SPEED_DEFAULT             = 0x08,     /* Default speed                        */
-    POLYCHROME_V2_RAINBOW_SPEED_MAX                 = 0x02,     /* Fastest speed                        */
-};
-
-class PolychromeController
-{
-public:
-    PolychromeController(i2c_smbus_interface* bus, polychrome_dev_id dev);
-    ~PolychromeController();
-
-    std::string     GetDeviceLocation();
-    std::string     GetDeviceName();
-    std::string     GetFirmwareVersion();
-    unsigned int    GetMode();
-    unsigned int    GetASRockType();
-    void            SetColorsAndSpeed(unsigned char led, unsigned char red, unsigned char green, unsigned char blue);
-    void            SetMode(unsigned char zone, unsigned char mode, unsigned char speed);
-
-    unsigned char           zone_led_count[6];
-    
-private:
-    unsigned int            asrock_type;
-    unsigned short          fw_version;
-    std::string             device_name;
-    unsigned char           active_zone;
-    unsigned char           active_mode;
-    unsigned char           active_speed;
-    i2c_smbus_interface*    bus;
-    polychrome_dev_id       dev;
-
-    unsigned short  ReadFirmwareVersion();
-    void            ReadLEDConfiguration();
-};

Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusControllerDetect.cpp

@@ -1,89 +0,0 @@
-#include "Detector.h"
-#include "ASRockPolychromeSMBusController.h"
-#include "LogManager.h"
-#include "RGBController.h"
-#include "RGBController_ASRockPolychromeSMBus.h"
-#include "i2c_smbus.h"
-#include "pci_ids.h"
-#include <vector>
-#include <stdio.h>
-#include <stdlib.h>
-
-/******************************************************************************************\
-*                                                                                          *
-*   TestForPolychromeSMBusController                                                       *
-*                                                                                          *
-*       Tests the given address to see if an ASRock Polychrome RGB controller exists there.*
-*       First does a quick write to test for a response                                    *
-*                                                                                          *
-\******************************************************************************************/
-
-bool TestForPolychromeSMBusController(i2c_smbus_interface* bus, unsigned char address)
-{
-    bool pass = false;
-
-    int res = bus->i2c_smbus_write_quick(address, I2C_SMBUS_WRITE);
-
-    if (res >= 0)
-    {
-        pass = true;
-    }
-
-    return(pass);
-
-}   /* TestForPolychromeController() */
-
-/******************************************************************************************\
-*                                                                                          *
-*   DetectPolychromeControllers                                                            *
-*                                                                                          *
-*       Detect ASRock Polychrome RGB SMBus controllers on the enumerated I2C busses at     *
-*       address 0x6A.                                                                      *
-*                                                                                          *
-*           bus - pointer to i2c_smbus_interface where Polychrome device is connected      *
-*           dev - I2C address of Polychrome device                                         *
-*                                                                                          *
-\******************************************************************************************/
-
-void DetectPolychromeSMBusControllers(std::vector<i2c_smbus_interface*>& busses)
-{
-    for(unsigned int bus = 0; bus < busses.size(); bus++)
-    {
-        IF_MOBO_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device)
-        {
-            if(busses[bus]->pci_subsystem_vendor == ASROCK_SUB_VEN)
-            {
-                LOG_DEBUG(SMBUS_CHECK_DEVICE_MESSAGE_EN, ASROCK_DETECTOR_NAME, bus, VENDOR_NAME, SMBUS_ADDRESS);
-                // Check for Polychrome controller at 0x6A
-                if(TestForPolychromeSMBusController(busses[bus], SMBUS_ADDRESS))
-                {
-                    LOG_DEBUG("[%s] Detected a device at address %02X, testing for a known controller",  ASROCK_DETECTOR_NAME, SMBUS_ADDRESS);
-                    PolychromeController* controller = new PolychromeController(busses[bus], SMBUS_ADDRESS);
-
-                    if(controller->GetASRockType() != ASROCK_TYPE_UNKNOWN)
-                    {
-                        LOG_DEBUG("[%s] Found a known Polychrome device", ASROCK_DETECTOR_NAME);
-                        RGBController_Polychrome* rgb_controller = new RGBController_Polychrome(controller);
-                        ResourceManager::get()->RegisterRGBController(rgb_controller);
-                    }
-                    else
-                    {
-                        LOG_DEBUG("[%s] Not a Polychrome device or unknown type", ASROCK_DETECTOR_NAME);
-                        delete controller;
-                    }
-                }
-                else
-                {
-                    LOG_DEBUG("[%s] Bus %02d no response at %02X", ASROCK_DETECTOR_NAME, bus, SMBUS_ADDRESS);
-                }
-            }
-            else
-            {
-                LOG_DEBUG(SMBUS_CHECK_DEVICE_FAILURE_EN, ASROCK_DETECTOR_NAME, bus, VENDOR_NAME);
-            } 
-        }
-    }
-
-}   /* DetectSMBusPolychromeControllers() */
-
-REGISTER_I2C_DETECTOR("ASRock Polychrome SMBus", DetectPolychromeSMBusControllers);

Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp

@@ -1,656 +0,0 @@
-/*-----------------------------------------*\
-|  RGBController_ASRockPolychromeSMBus.cpp  |
-|                                           |
-|  Generic RGB Interface for OpenRGB        |
-|  ASRock ASR LED and Polychrome RGB Driver |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/15/2019  |
-\*-----------------------------------------*/
-
-#include "RGBController_ASRockPolychromeSMBus.h"
-
-#define ASROCK_MAX_ZONES    4
-#define ASROCK_MAX_LEDS     22
-
-static const char* polychrome_v1_zone_names[] =
-{
-    "RGB LED 1 Header",
-    "RGB LED 2 Header",
-    "PCH",
-    "IO Cover",
-    "Audio",
-    "Addressable Header"
-};
-
-static const char* polychrome_v2_zone_names[] =
-{
-    "RGB LED 1 Header",
-    "RGB LED 2 Header",
-    "Audio",
-    "PCH",
-    "IO Cover",
-    "Addressable Header"
-};
-
-/**------------------------------------------------------------------*\
-    @name ASRock Polychrome SMBus
-    @type SMBus
-    @save :warning:
-    @direct :x:
-    @effects :white_check_mark:
-    @detectors DetectPolychromeSMBusControllers
-    @comment ASRock Polychrome controllers will save with each update.
-        Per ARGB LED support is not possible with these devices.
-\*-------------------------------------------------------------------*/
-
-RGBController_Polychrome::RGBController_Polychrome(PolychromeController* controller_ptr)
-{
-    controller  = controller_ptr;
-
-    name        = controller->GetDeviceName();
-    vendor      = "ASRock";
-    version     = controller->GetFirmwareVersion();
-    type        = DEVICE_TYPE_MOTHERBOARD;
-    location    = controller->GetDeviceLocation();
-
-    switch(controller->GetASRockType())
-    {
-        case ASROCK_TYPE_ASRLED:
-            {
-                description = "ASRock ASR RGB LED Device";
-
-                mode Off;
-                Off.name                    = "Off";
-                Off.value                   = ASRLED_MODE_OFF;
-                Off.flags                   = 0;
-                Off.color_mode              = MODE_COLORS_NONE;
-                modes.push_back(Off);
-
-                mode Static;
-                Static.name                 = "Static";
-                Static.value                = ASRLED_MODE_STATIC;
-                Static.flags                = MODE_FLAG_HAS_PER_LED_COLOR;
-                Static.color_mode           = MODE_COLORS_PER_LED;
-                modes.push_back(Static);
-
-                mode Breathing;
-                Breathing.name              = "Breathing";
-                Breathing.value             = ASRLED_MODE_BREATHING;
-                Breathing.flags             = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR;
-                Breathing.speed_min         = ASRLED_SPEED_MIN;
-                Breathing.speed_max         = ASRLED_SPEED_MAX;
-                Breathing.speed             = ASRLED_SPEED_DEFAULT;
-                Breathing.color_mode        = MODE_COLORS_PER_LED;
-                modes.push_back(Breathing);
-
-                mode Strobe;
-                Strobe.name                 = "Strobe";
-                Strobe.value                = ASRLED_MODE_STROBE;
-                Strobe.flags                = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR;
-                Strobe.speed_min            = ASRLED_SPEED_MIN;
-                Strobe.speed_max            = ASRLED_SPEED_MAX;
-                Strobe.speed                = ASRLED_SPEED_DEFAULT;
-                Strobe.color_mode           = MODE_COLORS_PER_LED;
-                modes.push_back(Strobe);
-
-                mode SpectrumCycle;
-                SpectrumCycle.name          = "Spectrum Cycle";
-                SpectrumCycle.value         = ASRLED_MODE_SPECTRUM_CYCLE;
-                SpectrumCycle.flags         = MODE_FLAG_HAS_SPEED;
-                SpectrumCycle.speed_min     = ASRLED_SPEED_MIN;
-                SpectrumCycle.speed_max     = ASRLED_SPEED_MAX;
-                SpectrumCycle.speed         = ASRLED_SPEED_DEFAULT;
-                SpectrumCycle.color_mode    = MODE_COLORS_NONE;
-                modes.push_back(SpectrumCycle);
-
-                mode Random;
-                Random.name                 = "Random";
-                Random.value                = ASRLED_MODE_RANDOM;
-                Random.flags                = MODE_FLAG_HAS_SPEED;
-                Random.speed_min            = ASRLED_SPEED_MIN;
-                Random.speed_max            = ASRLED_SPEED_MAX;
-                Random.speed                = ASRLED_SPEED_DEFAULT;
-                Random.color_mode           = MODE_COLORS_NONE;
-                modes.push_back(Random);
-
-                mode Music;
-                Music.name                  = "Music";
-                Music.value                 = ASRLED_MODE_MUSIC;
-                Music.flags                 = MODE_FLAG_HAS_PER_LED_COLOR;
-                Music.color_mode            = MODE_COLORS_PER_LED;
-                modes.push_back(Music);
-
-                mode Wave;
-                Wave.name                   = "Wave";
-                Wave.value                  = ASRLED_MODE_WAVE;
-                Wave.flags                  = MODE_FLAG_HAS_SPEED;
-                Wave.speed_min              = ASRLED_SPEED_MIN;
-                Wave.speed_max              = ASRLED_SPEED_MAX;
-                Wave.speed                  = ASRLED_SPEED_DEFAULT;
-                Wave.color_mode             = MODE_COLORS_NONE;
-                modes.push_back(Wave);
-            }
-            break;
-
-        case ASROCK_TYPE_POLYCHROME_V1:
-            {
-                description = "ASRock Polychrome v1 Device";
-
-                mode Off;
-                Off.name                    = "Off";
-                Off.value                   = POLYCHROME_V1_MODE_OFF;
-                Off.flags                   = 0;
-                Off.color_mode              = MODE_COLORS_NONE;
-                modes.push_back(Off);
-
-                mode Static;
-                Static.name                 = "Static";
-                Static.value                = POLYCHROME_V1_MODE_STATIC;
-                Static.flags                = MODE_FLAG_HAS_PER_LED_COLOR;
-                Static.color_mode           = MODE_COLORS_PER_LED;
-                modes.push_back(Static);
-
-                mode Breathing;
-                Breathing.name              = "Breathing";
-                Breathing.value             = POLYCHROME_V1_MODE_BREATHING;
-                Breathing.flags             = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR;
-                Breathing.speed_min         = POLYCHROME_V1_SPEED_MIN_BREATHING;
-                Breathing.speed_max         = POLYCHROME_V1_SPEED_MAX_BREATHING;
-                Breathing.speed             = POLYCHROME_V1_SPEED_DEFAULT_BREATHING;
-                Breathing.color_mode        = MODE_COLORS_PER_LED;
-                modes.push_back(Breathing);
-
-                mode Strobe;
-                Strobe.name                 = "Strobe";
-                Strobe.value                = POLYCHROME_V1_MODE_STROBE;
-                Strobe.flags                = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR;
-                Strobe.speed_min            = POLYCHROME_V1_SPEED_MIN_STROBE;
-                Strobe.speed_max            = POLYCHROME_V1_SPEED_MAX_STROBE;
-                Strobe.speed                = POLYCHROME_V1_SPEED_DEFAULT_STROBE;
-                Strobe.color_mode           = MODE_COLORS_PER_LED;
-                modes.push_back(Strobe);
-
-                mode SpectrumCycle;
-                SpectrumCycle.name          = "Spectrum Cycle";
-                SpectrumCycle.value         = POLYCHROME_V1_MODE_SPECTRUM_CYCLE;
-                SpectrumCycle.flags         = MODE_FLAG_HAS_SPEED;
-                SpectrumCycle.speed_min     = POLYCHROME_V1_SPEED_MIN_CYCLE;
-                SpectrumCycle.speed_max     = POLYCHROME_V1_SPEED_MAX_CYCLE;
-                SpectrumCycle.speed         = POLYCHROME_V1_SPEED_DEFAULT_CYCLE;
-                SpectrumCycle.color_mode    = MODE_COLORS_NONE;
-                modes.push_back(SpectrumCycle);
-
-                mode Random;
-                Random.name                 = "Random";
-                Random.value                = POLYCHROME_V1_MODE_RANDOM;
-                Random.flags                = MODE_FLAG_HAS_SPEED;
-                Random.speed_min            = POLYCHROME_V1_SPEED_MIN_RANDOM;
-                Random.speed_max            = POLYCHROME_V1_SPEED_MAX_RANDOM;
-                Random.speed                = POLYCHROME_V1_SPEED_DEFAULT_RANDOM;
-                Random.color_mode           = MODE_COLORS_NONE;
-                modes.push_back(Random);
-
-                mode Music;
-                Music.name                 = "Music";
-                Music.value                = POLYCHROME_V1_MODE_MUSIC;
-                Music.flags                = MODE_FLAG_HAS_PER_LED_COLOR;
-                Music.color_mode           = MODE_COLORS_PER_LED;
-                modes.push_back(Music);
-
-                mode Wave;
-                Wave.name                   = "Wave";
-                Wave.value                  = POLYCHROME_V1_MODE_WAVE;
-                Wave.flags                  = MODE_FLAG_HAS_SPEED;
-                Wave.speed_min              = POLYCHROME_V1_SPEED_MIN_WAVE;
-                Wave.speed_max              = POLYCHROME_V1_SPEED_MAX_WAVE;
-                Wave.speed                  = POLYCHROME_V1_SPEED_DEFAULT_WAVE;
-                Wave.color_mode             = MODE_COLORS_NONE;
-                modes.push_back(Wave);
-
-                /*---------------------------------------------------------------------*\
-                | Comment out until per zone modes are working. These are only for ARGB |
-                \*---------------------------------------------------------------------*/
-                /*
-                mode Spring;
-                Spring.name                 = "Spring";
-                Spring.value                = POLYCHROME_V1_MODE_SPRING;
-                Spring.flags                = MODE_FLAG_HAS_SPEED;
-                Spring.speed_min            = POLYCHROME_V1_SPEED_MIN_ARGB;
-                Spring.speed_max            = POLYCHROME_V1_SPEED_MAX_ARGB;
-                Spring.speed                = POLYCHROME_V1_SPEED_DEFAULT_SPRING;
-                Spring.color_mode           = MODE_COLORS_PER_LED;
-                modes.push_back(Spring);
-
-                mode Stack;
-                Stack.name                  = "Stack";
-                Stack.value                 = POLYCHROME_V1_MODE_STACK;
-                Stack.flags                 = MODE_FLAG_HAS_SPEED;
-                Stack.speed_min             = POLYCHROME_V1_SPEED_MIN_ARGB;
-                Stack.speed_max             = POLYCHROME_V1_SPEED_MAX_ARGB;
-                Stack.speed                 = POLYCHROME_V1_SPEED_DEFAULT_STACK;
-                Stack.color_mode            = MODE_COLORS_PER_LED;
-                modes.push_back(Stack);
-
-                mode Cram;
-                Cram.name                   = "Cram";
-                Cram.value                  = POLYCHROME_V1_MODE_CRAM;
-                Cram.flags                  = MODE_FLAG_HAS_SPEED;
-                Cram.speed_min              = POLYCHROME_V1_SPEED_MIN_ARGB;
-                Cram.speed_max              = POLYCHROME_V1_SPEED_MAX_ARGB;
-                Cram.speed                  = POLYCHROME_V1_SPEED_DEFAULT_CRAM;
-                Cram.color_mode             = MODE_COLORS_PER_LED;
-                modes.push_back(Cram);
-
-                mode Scan;
-                Scan.name                   = "Scan";
-                Scan.value                  = POLYCHROME_V1_MODE_SCAN;
-                Scan.flags                  = MODE_FLAG_HAS_SPEED;
-                Scan.speed_min              = POLYCHROME_V1_SPEED_MIN_ARGB;
-                Scan.speed_max              = POLYCHROME_V1_SPEED_MAX_ARGB;
-                Scan.speed                  = POLYCHROME_V1_SPEED_DEFAULT_SCAN;
-                Scan.color_mode             = MODE_COLORS_PER_LED;
-                modes.push_back(Scan);
-
-                mode Neon;
-                Neon.name                   = "Neon";
-                Neon.value                  = POLYCHROME_V1_MODE_NEON;
-                Neon.flags                  = MODE_FLAG_HAS_SPEED;
-                Neon.speed_min              = POLYCHROME_V1_SPEED_MIN_ARGB;
-                Neon.speed_max              = POLYCHROME_V1_SPEED_MAX_ARGB;
-                Neon.speed                  = POLYCHROME_V1_SPEED_DEFAULT_NEON;
-                Neon.color_mode             = MODE_COLORS_PER_LED;
-                modes.push_back(Neon);
-
-                mode Water;
-                Water.name                  = "Water";
-                Water.value                 = POLYCHROME_V1_MODE_WATER;
-                Water.flags                 = MODE_FLAG_HAS_SPEED;
-                Water.speed_min             = POLYCHROME_V1_SPEED_MIN_ARGB;
-                Water.speed_max             = POLYCHROME_V1_SPEED_MAX_ARGB;
-                Water.speed                 = POLYCHROME_V1_SPEED_DEFAULT_WATER;
-                Water.color_mode            = MODE_COLORS_PER_LED;
-                modes.push_back(Water);
-
-                mode Rainbow;
-                Rainbow.name                = "Rainbow";
-                Rainbow.value               = POLYCHROME_V1_MODE_RAINBOW;
-                Rainbow.flags               = MODE_FLAG_HAS_SPEED;
-                Rainbow.speed_min           = POLYCHROME_V1_SPEED_MIN_RAINBOW;
-                Rainbow.speed_max           = POLYCHROME_V1_SPEED_MAX_RAINBOW;
-                Rainbow.speed               = POLYCHROME_V1_SPEED_DEFAULT_RAINBOW;
-                Rainbow.color_mode          = MODE_COLORS_NONE;
-                modes.push_back(Rainbow);
-                */
-            }
-            break;
-
-        case ASROCK_TYPE_POLYCHROME_V2:
-            {
-                description = "ASRock Polychrome v2 Device";
-
-                mode Off;
-                Off.name                    = "Off";
-                Off.value                   = POLYCHROME_V2_MODE_OFF;
-                Off.flags                   = 0;
-                Off.color_mode              = MODE_COLORS_NONE;
-                modes.push_back(Off);
-
-                mode Static;
-                Static.name                 = "Static";
-                Static.value                = POLYCHROME_V2_MODE_STATIC;
-                Static.flags                = MODE_FLAG_HAS_PER_LED_COLOR;
-                Static.color_mode           = MODE_COLORS_PER_LED;
-                modes.push_back(Static);
-
-                mode Breathing;
-                Breathing.name              = "Breathing";
-                Breathing.value             = POLYCHROME_V2_MODE_BREATHING;
-                Breathing.flags             = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR;
-                Breathing.speed_min         = POLYCHROME_V2_BREATHING_SPEED_MIN;
-                Breathing.speed_max         = POLYCHROME_V2_BREATHING_SPEED_MAX;
-                Breathing.speed             = POLYCHROME_V2_BREATHING_SPEED_DEFAULT;
-                Breathing.color_mode        = MODE_COLORS_PER_LED;
-                modes.push_back(Breathing);
-
-                mode Strobe;
-                Strobe.name                 = "Strobe";
-                Strobe.value                = POLYCHROME_V2_MODE_STROBE;
-                Strobe.flags                = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR;
-                Strobe.speed_min            = POLYCHROME_V2_STROBE_SPEED_MIN;
-                Strobe.speed_max            = POLYCHROME_V2_STROBE_SPEED_MAX;
-                Strobe.speed                = POLYCHROME_V2_STROBE_SPEED_DEFAULT;
-                Strobe.color_mode           = MODE_COLORS_PER_LED;
-                modes.push_back(Strobe);
-
-                mode SpectrumCycle;
-                SpectrumCycle.name          = "Spectrum Cycle";
-                SpectrumCycle.value         = POLYCHROME_V2_MODE_SPECTRUM_CYCLE;
-                SpectrumCycle.flags         = MODE_FLAG_HAS_SPEED;
-                SpectrumCycle.speed_min     = POLYCHROME_V2_SPECTRUM_CYCLE_SPEED_MIN;
-                SpectrumCycle.speed_max     = POLYCHROME_V2_SPECTRUM_CYCLE_SPEED_MAX;
-                SpectrumCycle.speed         = POLYCHROME_V2_SPECTRUM_CYCLE_SPEED_DEFAULT;
-                SpectrumCycle.color_mode    = MODE_COLORS_NONE;
-                modes.push_back(SpectrumCycle);
-
-                mode Random;
-                Random.name                 = "Random";
-                Random.value                = POLYCHROME_V2_MODE_RANDOM;
-                Random.flags                = MODE_FLAG_HAS_SPEED;
-                Random.speed_min            = POLYCHROME_V2_RANDOM_SPEED_MIN;
-                Random.speed_max            = POLYCHROME_V2_RANDOM_SPEED_MAX;
-                Random.speed                = POLYCHROME_V2_RANDOM_SPEED_DEFAULT;
-                Random.color_mode           = MODE_COLORS_NONE;
-                modes.push_back(Random);
-
-                mode Wave;
-                Wave.name                   = "Wave";
-                Wave.value                  = POLYCHROME_V2_MODE_WAVE;
-                Wave.flags                  = MODE_FLAG_HAS_SPEED;
-                Wave.speed_min              = POLYCHROME_V2_WAVE_SPEED_MIN;
-                Wave.speed_max              = POLYCHROME_V2_WAVE_SPEED_MAX;
-                Wave.speed                  = POLYCHROME_V2_WAVE_SPEED_DEFAULT;
-                Wave.color_mode             = MODE_COLORS_NONE;
-                modes.push_back(Wave);
-
-                mode Spring;
-                Spring.name                 = "Spring";
-                Spring.value                = POLYCHROME_V2_MODE_SPRING;
-                Spring.flags                = MODE_FLAG_HAS_SPEED;
-                Spring.speed_min            = POLYCHROME_V2_SPRING_SPEED_MIN;
-                Spring.speed_max            = POLYCHROME_V2_SPRING_SPEED_MAX;
-                Spring.speed                = POLYCHROME_V2_SPRING_SPEED_DEFAULT;
-                Spring.color_mode           = MODE_COLORS_NONE;
-                modes.push_back(Spring);
-
-                mode Stack;
-                Stack.name                  = "Stack";
-                Stack.value                 = POLYCHROME_V2_MODE_STACK;
-                Stack.flags                 = MODE_FLAG_HAS_SPEED;
-                Stack.speed_min             = POLYCHROME_V2_STACK_SPEED_MIN;
-                Stack.speed_max             = POLYCHROME_V2_STACK_SPEED_MAX;
-                Stack.speed                 = POLYCHROME_V2_STACK_SPEED_DEFAULT;
-                Stack.color_mode            = MODE_COLORS_NONE;
-                modes.push_back(Stack);
-
-                mode Cram;
-                Cram.name                   = "Cram";
-                Cram.value                  = POLYCHROME_V2_MODE_CRAM;
-                Cram.flags                  = MODE_FLAG_HAS_SPEED;
-                Cram.speed_min              = POLYCHROME_V2_CRAM_SPEED_MIN;
-                Cram.speed_max              = POLYCHROME_V2_CRAM_SPEED_MAX;
-                Cram.speed                  = POLYCHROME_V2_CRAM_SPEED_DEFAULT;
-                Cram.color_mode             = MODE_COLORS_NONE;
-                modes.push_back(Cram);
-
-                mode Scan;
-                Scan.name                   = "Scan";
-                Scan.value                  = POLYCHROME_V2_MODE_SCAN;
-                Scan.flags                  = MODE_FLAG_HAS_SPEED;
-                Scan.speed_min              = POLYCHROME_V2_SCAN_SPEED_MIN;
-                Scan.speed_max              = POLYCHROME_V2_SCAN_SPEED_MAX;
-                Scan.speed                  = POLYCHROME_V2_SCAN_SPEED_DEFAULT;
-                Scan.color_mode             = MODE_COLORS_NONE;
-                modes.push_back(Scan);
-
-                mode Neon;
-                Neon.name                   = "Neon";
-                Neon.value                  = POLYCHROME_V2_MODE_NEON;
-                Neon.flags                  = MODE_FLAG_HAS_SPEED;
-                Neon.speed_min              = POLYCHROME_V2_NEON_SPEED_MIN;
-                Neon.speed_max              = POLYCHROME_V2_NEON_SPEED_MAX;
-                Neon.speed                  = POLYCHROME_V2_NEON_SPEED_DEFAULT;
-                Neon.color_mode             = MODE_COLORS_NONE;
-                modes.push_back(Neon);
-
-                mode Water;
-                Water.name                  = "Water";
-                Water.value                 = POLYCHROME_V2_MODE_WATER;
-                Water.flags                 = MODE_FLAG_HAS_SPEED;
-                Water.speed_min             = POLYCHROME_V2_WATER_SPEED_MIN;
-                Water.speed_max             = POLYCHROME_V2_WATER_SPEED_MAX;
-                Water.speed                 = POLYCHROME_V2_WATER_SPEED_DEFAULT;
-                Water.color_mode            = MODE_COLORS_NONE;
-                modes.push_back(Water);
-
-                mode Rainbow;
-                Rainbow.name                = "Rainbow";
-                Rainbow.value               = POLYCHROME_V2_MODE_RAINBOW;
-                Rainbow.flags               = MODE_FLAG_HAS_SPEED;
-                Rainbow.speed_min           = POLYCHROME_V2_RAINBOW_SPEED_MIN;
-                Rainbow.speed_max           = POLYCHROME_V2_RAINBOW_SPEED_MAX;
-                Rainbow.speed               = POLYCHROME_V2_RAINBOW_SPEED_DEFAULT;
-                Rainbow.color_mode          = MODE_COLORS_NONE;
-                modes.push_back(Rainbow);
-            }
-            break;
-    }
-
-    SetupZones();
-}
-
-RGBController_Polychrome::~RGBController_Polychrome()
-{
-    delete controller;
-}
-
-void RGBController_Polychrome::SetupZones()
-{
-    switch(controller->GetASRockType())
-    {
-        /*---------------------------------------------------------*\
-        | ASR LED motherboards only have a single zone/LED          |
-        \*---------------------------------------------------------*/
-        case ASROCK_TYPE_ASRLED:
-            {
-                /*---------------------------------------------------------*\
-                | Set up zones                                              |
-                \*---------------------------------------------------------*/
-                zone* new_zone = new zone();
-
-                /*---------------------------------------------------------*\
-                | Set single zone name to "Motherboard"                     |
-                \*---------------------------------------------------------*/
-                new_zone->name          = "Motherboard";
-                new_zone->type          = ZONE_TYPE_SINGLE;
-                new_zone->leds_min      = 1;
-                new_zone->leds_max      = 1;
-                new_zone->leds_count    = 1;
-                new_zone->matrix_map    = NULL;
-
-                /*---------------------------------------------------------*\
-                | Push new zone to zones vector                             |
-                \*---------------------------------------------------------*/
-                zones.push_back(*new_zone);
-
-                /*---------------------------------------------------------*\
-                | Set up LEDs                                               |
-                \*---------------------------------------------------------*/
-                led* new_led = new led();
-
-                /*---------------------------------------------------------*\
-                | Set single LED name to "Motherboard"                      |
-                \*---------------------------------------------------------*/
-                new_led->name           = "Motherboard";
-
-                /*---------------------------------------------------------*\
-                | Push new LED to LEDs vector                               |
-                \*---------------------------------------------------------*/
-                leds.push_back(*new_led);
-            }
-            break;
-
-        /*---------------------------------------------------------*\
-        | Polychrome motherboards should set up zones based on LED  |
-        | configuration register read from device                   |
-        \*---------------------------------------------------------*/
-        case ASROCK_TYPE_POLYCHROME_V1:
-        case ASROCK_TYPE_POLYCHROME_V2:
-            {
-                /*---------------------------------------------------------*\
-                | Set up zones                                              |
-                \*---------------------------------------------------------*/
-                for(unsigned int zone_idx = 0; zone_idx < POLYCHROME_ZONE_COUNT; zone_idx++)
-                {
-                    if(controller->zone_led_count[zone_idx] > 0)
-                    {
-                        zone* new_zone = new zone();
-
-                        /*---------------------------------------------------------*\
-                        | Set zone name to channel name                             |
-                        \*---------------------------------------------------------*/
-                        if(controller->GetASRockType() == ASROCK_TYPE_POLYCHROME_V1)
-                        {
-                            new_zone->name          = polychrome_v1_zone_names[zone_idx];
-                        }
-                        else
-                        {
-                            new_zone->name          = polychrome_v2_zone_names[zone_idx];
-                        }
-                        
-                        if(zone_idx == POLYCHROME_ZONE_ADDRESSABLE)
-                        {
-                            new_zone->leds_min      = 1;
-                            new_zone->leds_max      = 1;
-                            new_zone->leds_count    = 1;
-                        }
-                        else
-                        {
-                            new_zone->leds_min      = controller->zone_led_count[zone_idx];
-                            new_zone->leds_max      = controller->zone_led_count[zone_idx];
-                            new_zone->leds_count    = controller->zone_led_count[zone_idx];
-                        }
-
-                        if(new_zone->leds_count > 1)
-                        {
-                            new_zone->type          = ZONE_TYPE_LINEAR;
-                        }
-                        else
-                        {
-                            new_zone->type          = ZONE_TYPE_SINGLE;
-                        }
-
-                        new_zone->matrix_map        = NULL;
-
-                        /*---------------------------------------------------------*\
-                        | Push new zone to zones vector                             |
-                        \*---------------------------------------------------------*/
-                        zones.push_back(*new_zone);
-                    }
-                }
-
-                unsigned int led_count = 0;
-                /*---------------------------------------------------------*\
-                | Set up LEDs                                               |
-                \*---------------------------------------------------------*/
-                for(unsigned int zone_idx = 0; zone_idx < POLYCHROME_ZONE_COUNT; zone_idx++)
-                {
-                    if(controller->zone_led_count[zone_idx] > 0)
-                    {
-                        for(unsigned int led_idx = 0; led_idx < controller->zone_led_count[zone_idx]; led_idx++)
-                        {
-                            /*---------------------------------------------------------*\
-                            | Each zone only has one LED                                |
-                            \*---------------------------------------------------------*/
-                            led* new_led = new led();
-
-                            if(controller->GetASRockType() == ASROCK_TYPE_POLYCHROME_V1)
-                                {
-                                    new_led->name           = polychrome_v1_zone_names[zone_idx];
-                                }
-                                else
-                                {
-                                    new_led->name           = polychrome_v2_zone_names[zone_idx];
-                                }
-
-                            new_led->name.append(" " + std::to_string(led_idx + 1));
-                            new_led->value = 0;
-
-                            if(controller->GetASRockType() == ASROCK_TYPE_POLYCHROME_V1)
-                            {
-                                new_led->value              = zone_idx;
-                            }
-                            else if(zone_idx == POLYCHROME_ZONE_ADDRESSABLE)
-                            {
-                                new_led->value              = 0x19;
-                            }
-
-                            /*---------------------------------------------------------*\
-                            | Push new LED to LEDs vector                               |
-                            \*---------------------------------------------------------*/
-                            leds.push_back(*new_led);
-
-                            led_count++;
-
-                            if(zone_idx == POLYCHROME_ZONE_ADDRESSABLE)
-                            {
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-            break;
-    }
-
-    SetupColors();
-}
-
-void RGBController_Polychrome::ResizeZone(int /*zone*/, int /*new_size*/)
-{
-    /*---------------------------------------------------------*\
-    | This device does not support resizing zones               |
-    \*---------------------------------------------------------*/
-}
-
-void RGBController_Polychrome::DeviceUpdateLEDs()
-{
-    for (std::size_t led = 0; led < colors.size(); led++)
-    {
-        UpdateSingleLED(led);
-    }
-}
-
-void RGBController_Polychrome::UpdateZoneLEDs(int /*zone*/)
-{
-    DeviceUpdateLEDs();
-}
-
-void RGBController_Polychrome::UpdateSingleLED(int led)
-{
-    unsigned char red = RGBGetRValue(colors[led]);
-    unsigned char grn = RGBGetGValue(colors[led]);
-    unsigned char blu = RGBGetBValue(colors[led]);
-
-    /*---------------------------------------------------------*\
-    | If the LED value is non-zero, this LED overrides the LED  |
-    | index                                                     |
-    \*---------------------------------------------------------*/
-    if(leds[led].value != 0)
-    {
-        led = leds[led].value;
-    }
-
-    controller->SetColorsAndSpeed(led, red, grn, blu);
-}
-
-void RGBController_Polychrome::SetCustomMode()
-{
-    active_mode = 1;
-}
-
-void RGBController_Polychrome::DeviceUpdateMode()
-{
-    if(controller->GetASRockType() == ASROCK_TYPE_POLYCHROME_V1)
-    {
-        for(unsigned int led_idx = 0; led_idx < leds.size(); led_idx++)
-        {
-            controller->SetMode(led_idx, modes[active_mode].value, modes[active_mode].speed);
-        }
-    }
-    else
-    {
-        controller->SetMode(0, modes[active_mode].value, modes[active_mode].speed);
-    }
-
-    DeviceUpdateLEDs();
-}

Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.cpp

@@ -20,6 +20,18 @@
 #define POLYCHROME_USB_INIT             0xA4
 #define POLYCHROME_USB_COMMIT           0x12
 
+const char* polychrome_USB_zone_names[] =
+{
+    "RGB LED 1 Header",
+    "RGB LED 2 Header",
+    "Addressable Header 1",
+    "Addressable Header 2",
+    "PCH",
+    "IO Cover",
+    "PCB",
+    "Audio",
+};
+
 PolychromeUSBController::PolychromeUSBController(hid_device* dev_handle, const char* path)
 {
     DMIInfo       dmi;
@@ -165,6 +177,41 @@ void PolychromeUSBController::WriteZone
     hid_read(dev, usb_buf, 64);
 };
 
+void PolychromeUSBController::WriteAllZones
+    (
+    const std::vector<PolychromeZoneInfo>&  zones_info,
+    const std::vector<zone>&                zones
+    )
+{
+    unsigned char usb_buf[65];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up message packet with leading 00                  |
+    \*-----------------------------------------------------*/
+    usb_buf[0x01] = POLYCHROME_USB_SET_ZONE;
+    usb_buf[0x03] = 0x07;
+    usb_buf[0x04] = zones_info[0].mode;
+    usb_buf[0x04] = 0xE2;
+
+    for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
+    {
+        usb_buf[0x05 + (3 * zone_idx)    ] = RGBGetRValue(zones[zone_idx].colors[0]);
+        usb_buf[0x05 + (3 * zone_idx) + 1] = RGBGetGValue(zones[zone_idx].colors[0]);
+        usb_buf[0x05 + (3 * zone_idx) + 2] = RGBGetBValue(zones[zone_idx].colors[0]);
+    }
+    
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_write(dev, usb_buf, 65);
+    hid_read(dev, usb_buf, 64);
+}
+
 void PolychromeUSBController::WriteRGSwap
     (
     bool ahdr1,
@@ -262,7 +309,7 @@ PolychromeZoneInfo PolychromeUSBController::GetZoneConfig(unsigned char zone)
     g   = usb_buf[0x06];
     b   = usb_buf[0x07];
 
-    zoneinfo.mode   = usb_buf[0x04];
+    zoneinfo.mode   = usb_buf[0x04] != 0xE2 ? usb_buf[0x04] : 0x0F;
     zoneinfo.color  = ToRGBColor(r,g,b);  
     zoneinfo.speed  = usb_buf[0x08];
     zoneinfo.zone   = usb_buf[0x03];

Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.h

@@ -16,7 +16,7 @@
 /*----------------------------------------------------------------------------------------------*\
 | Definitions for Polychrome USB                                                                 |
 \*----------------------------------------------------------------------------------------------*/
-#define POLYCHROME_USB_NUM_MODES            15          /* Number of Polychrome USB modes       */
+#define POLYCHROME_USB_NUM_MODES            16          /* Number of Polychrome USB modes       */
 
 enum
 {
@@ -35,6 +35,7 @@ enum
     POLYCHROME_USB_MODE_NEON                = 0x0C,     /* Neon effect mode                     */
     POLYCHROME_USB_MODE_WATER               = 0x0D,     /* Water effect mode                    */
     POLYCHROME_USB_MODE_RAINBOW             = 0x0E,     /* Rainbow effect mode                  */
+    POLYCHROME_USB_MODE_DIRECT              = 0x0F,     /* CHROMA CONNECT effect mode           */
 };
 
 enum
@@ -57,17 +58,7 @@ enum
     POLYCHROME_USB_ZONE_UNAVAILABLE         = 0x1E,     // Value from LEDCOUNT CFG if zone not present
 };
 
-static const char* polychrome_USB_zone_names[] =
-{
-    "RGB LED 1 Header",
-    "RGB LED 2 Header",
-    "Addressable Header 1",
-    "Addressable Header 2",
-    "PCH",
-    "IO Cover",
-    "PCB",
-    "Audio",
-};
+extern const char* polychrome_USB_zone_names[];
 
 enum
 {
@@ -127,6 +118,12 @@ public:
                                                     bool            allzone
                                                     );
 
+    void                                        WriteAllZones
+                                                    (
+                                                    const std::vector<PolychromeZoneInfo> &zones_info,
+                                                    const std::vector<zone> &zones
+                                                    );
+
     void                                        WriteHeader
                                                     (
                                                     unsigned char   cfg,

Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp

@@ -15,8 +15,9 @@
 
 /**------------------------------------------------------------------*\
     @name ASrock Polychrome USB
+    @category Motherboard
     @type USB
-    @save :warning:
+    @save :robot:
     @direct :x:
     @effects :white_check_mark:
     @detectors DetectPolychromeUSBControllers
@@ -172,6 +173,13 @@ RGBController_PolychromeUSB::RGBController_PolychromeUSB(PolychromeUSBController
     Rainbow.color_mode          = MODE_COLORS_NONE;
     modes.push_back(Rainbow);
 
+    mode Direct;
+    Direct.name                = "Direct";
+    Direct.value               = POLYCHROME_USB_MODE_DIRECT;
+    Direct.flags               = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode          = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
     SetupZones();
 
     /*-------------------------------------------------*\
@@ -203,15 +211,15 @@ void RGBController_PolychromeUSB::SetupZones()
             zones[channel_idx].name       = polychrome_USB_zone_names[device_info.zone_type];
             zones[channel_idx].leds_min   = 0;
             zones[channel_idx].leds_max   = ASROCK_ADDRESSABLE_MAX_LEDS;
-            zones[channel_idx].leds_count = device_info.num_leds; 
+            zones[channel_idx].leds_count = device_info.num_leds;
         }
-        else if(device_info.device_type==PolychromeDeviceType::FIXED) 
+        else if(device_info.device_type==PolychromeDeviceType::FIXED)
         {
             zones[channel_idx].name       = polychrome_USB_zone_names[device_info.zone_type];
             zones[channel_idx].leds_min   = device_info.num_leds;
             zones[channel_idx].leds_max   = device_info.num_leds;
-            zones[channel_idx].leds_count = device_info.num_leds; 
-        }       
+            zones[channel_idx].leds_count = device_info.num_leds;
+        }
 
 
         for(unsigned int led_ch_idx = 0; led_ch_idx < zones[channel_idx].leds_count; led_ch_idx++)
@@ -247,7 +255,7 @@ void RGBController_PolychromeUSB::SetupZones()
      for (unsigned int channel_idx = 0; channel_idx < zones.size(); channel_idx++)
     {
         PolychromeZoneInfo zoneinfo;
-        zoneinfo = controller->GetZoneConfig(channel_idx); 
+        zoneinfo = controller->GetZoneConfig(channel_idx);
         zones_info.push_back(zoneinfo);
     }
 
@@ -275,6 +283,11 @@ void RGBController_PolychromeUSB::ResizeZone(int zone, int new_size)
 
 void RGBController_PolychromeUSB::DeviceUpdateLEDs()
 {
+    if(POLYCHROME_USB_MODE_DIRECT == zones_info[0].mode )
+    {
+        controller->WriteAllZones(zones_info,zones);
+        return;
+    }
     for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
     {
         unsigned char set_mode = zones_info[zone_idx].mode;
@@ -320,12 +333,7 @@ unsigned char RGBController_PolychromeUSB::GetDeviceMode(unsigned char zone)
     dev_mode    = controller->GetZoneConfig(zone).mode;
     active_mode = dev_mode;
 
-    return(active_mode);  
-}
-
-void RGBController_PolychromeUSB::SetCustomMode()
-{
-    active_mode = POLYCHROME_USB_MODE_STATIC;
+    return(active_mode);
 }
 
 void RGBController_PolychromeUSB::DeviceUpdateMode()
@@ -337,10 +345,10 @@ void RGBController_PolychromeUSB::DeviceUpdateMode()
             unsigned char set_mode      =(unsigned char) modes[active_mode].value;
             zones_info[zone_idx].mode   =(unsigned char) modes[active_mode].value;
             zones_info[zone_idx].speed  =(unsigned char) modes[active_mode].speed;
-            
+
             if(set_mode > modes.size())
             {
-                set_mode = active_mode;                    
+                set_mode = active_mode;
             }
 
             controller->WriteZone(zone_idx, set_mode, zones_info[zone_idx].speed, zones[zone_idx].colors[0], false);

Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.h

@@ -25,7 +25,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:

Controllers/ASRockSMBusController/ASRockASRRGBSMBusController.cpp

@@ -0,0 +1,122 @@
+/*-----------------------------------------*\
+|  ASRockPolychromeSMBusController.cpp      |
+|                                           |
+|  Driver for for ASRock ASR LED and        |
+|  Polychrome RGB lighting controller       |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/14/2019  |
+\*-----------------------------------------*/
+
+#include "ASRockASRRGBSMBusController.h"
+#include <cstring>
+#include "dependencies/dmiinfo.h"
+#include "LogManager.h"
+
+#define ASROCK_ZONE_LED_COUNT_MESSAGE_EN    "[%s] Zone %i LED count: %02d"
+
+using namespace std::chrono_literals;
+
+ASRockASRRGBSMBusController::ASRockASRRGBSMBusController(i2c_smbus_interface* bus, polychrome_dev_id dev)
+{
+    this->bus = bus;
+    this->dev = dev;
+
+    DMIInfo dmi;
+
+    device_name =   "ASRock " + dmi.getMainboard();
+
+}
+
+ASRockASRRGBSMBusController::~ASRockASRRGBSMBusController()
+{
+
+}
+
+std::string ASRockASRRGBSMBusController::GetDeviceLocation()
+{
+    std::string return_string(bus->device_name);
+    char addr[5];
+    snprintf(addr, 5, "0x%02X", dev);
+    return_string.append(", address ");
+    return_string.append(addr);
+    return("I2C: " + return_string);
+}
+
+std::string ASRockASRRGBSMBusController::GetDeviceName()
+{
+    return(device_name);
+}
+
+std::string ASRockASRRGBSMBusController::GetFirmwareVersion()
+{
+    uint8_t  major_version = fw_version >> 8;
+    uint8_t  minor_version = fw_version & 0xFF;
+
+    return(std::to_string(major_version) + "." + std::to_string(minor_version));
+}
+
+uint8_t ASRockASRRGBSMBusController::GetMode()
+{
+    return(active_mode);
+}
+
+void ASRockASRRGBSMBusController::SetColorsAndSpeed(uint8_t led, uint8_t red, uint8_t green, uint8_t blue)
+{
+    uint8_t color_speed_pkt[4] = { red, green, blue, active_speed };
+    uint8_t select_led_pkt[1]  = { led };
+    
+    /*-----------------------------------------------------*\
+    | Select LED                                            |
+    \*-----------------------------------------------------*/
+    if(active_mode != ASRLED_MODE_OFF)
+    {
+        bus->i2c_smbus_write_block_data(dev, ASROCK_ASR_REG_LED_SELECT, 1, select_led_pkt);
+        std::this_thread::sleep_for(1ms);
+    }
+
+    switch(active_mode)
+    {
+        /*-----------------------------------------------------*\
+        | These modes take 4 bytes in R/G/B/S order             |
+        \*-----------------------------------------------------*/
+        case ASRLED_MODE_BREATHING:
+        case ASRLED_MODE_STROBE:
+        case ASRLED_MODE_SPECTRUM_CYCLE:
+            bus->i2c_smbus_write_block_data(dev, active_mode, 4, color_speed_pkt);
+            break;
+
+        /*-----------------------------------------------------*\
+        | These modes take 3 bytes in R/G/B order               |
+        \*-----------------------------------------------------*/
+        default:
+        case ASRLED_MODE_STATIC:
+        case ASRLED_MODE_MUSIC:
+            bus->i2c_smbus_write_block_data(dev, active_mode, 3, color_speed_pkt);
+            break;
+
+        /*-----------------------------------------------------*\
+        | These modes take 1 byte - speed                       |
+        \*-----------------------------------------------------*/
+        case ASRLED_MODE_RANDOM:
+        case ASRLED_MODE_WAVE:
+            bus->i2c_smbus_write_block_data(dev, active_mode, 1, &active_speed);
+            break;
+
+        /*-----------------------------------------------------*\
+        | These modes take no bytes                             |
+        \*-----------------------------------------------------*/
+        case ASRLED_MODE_OFF:
+            break;
+    }
+    std::this_thread::sleep_for(1ms);
+}
+
+void ASRockASRRGBSMBusController::SetMode(uint8_t zone,uint8_t mode, uint8_t speed)
+{
+    active_zone                     = zone;
+    active_mode                     = mode;
+    active_speed                    = speed;
+
+    bus->i2c_smbus_write_block_data(dev, ASROCK_ASR_REG_MODE, 1, &active_mode);
+    std::this_thread::sleep_for(1ms);
+}

Controllers/ASRockSMBusController/ASRockASRRGBSMBusController.h

@@ -0,0 +1,76 @@
+/*-----------------------------------------*\
+|  ASRockASRRGBSMBusController.h        |
+|                                           |
+|  Definitions and types for ASRock         |
+|  ASR LED and Polychrome RGB lighting      |
+|  controller                               |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/13/2019  |
+\*-----------------------------------------*/
+
+#include "i2c_smbus.h"
+#include <string>
+
+#pragma once
+
+typedef uint8_t	polychrome_dev_id;
+
+#define ASROCK_ASR_CONTROLLER_NAME  "ASRock ASR RGB SMBus Controller"
+
+enum
+{
+    /*------------------------------------------------------------------------------------------*\
+    | ASRock Common Registers                                                                    |
+    \*------------------------------------------------------------------------------------------*/
+    ASROCK_ASR_REG_FIRMWARE_VER             = 0x00,     /* Firmware version Major.Minor         */
+    ASROCK_ASR_REG_MODE                     = 0x30,     /* Mode selection register              */
+    ASROCK_ASR_REG_LED_SELECT               = 0x31,     /* LED selection register               */
+};
+
+/*----------------------------------------------------------------------------------------------*\
+| Definitions for ASR LED                                                                        |
+\*----------------------------------------------------------------------------------------------*/
+#define ASRLED_NUM_MODES                    8           /* Number of ASR LED modes              */
+
+enum
+{
+    ASRLED_MODE_OFF                         = 0x10,     /* OFF mode                             */
+    ASRLED_MODE_STATIC                      = 0x11,     /* Static color mode                    */
+    ASRLED_MODE_BREATHING                   = 0x12,     /* Breathing effect mode                */
+    ASRLED_MODE_STROBE                      = 0x13,     /* Strobe effect mode                   */
+    ASRLED_MODE_SPECTRUM_CYCLE              = 0x14,     /* Spectrum Cycle effect mode           */
+    ASRLED_MODE_RANDOM                      = 0x15,     /* Random effect mode                   */
+    ASRLED_MODE_MUSIC                       = 0x17,     /* Music effect mode                    */
+    ASRLED_MODE_WAVE                        = 0x18,     /* Wave effect mode                     */
+};
+
+enum
+{
+    ASRLED_SPEED_MIN                        = 0x05,     /* Slowest speed                        */
+    ASRLED_SPEED_DEFAULT                    = 0x03,     /* Default speed                        */
+    ASRLED_SPEED_MAX                        = 0x00,     /* Fastest speed                        */
+};
+
+class ASRockASRRGBSMBusController
+{
+public:
+    ASRockASRRGBSMBusController(i2c_smbus_interface* bus, polychrome_dev_id dev);
+    ~ASRockASRRGBSMBusController();
+
+    std::string             GetDeviceLocation();
+    std::string             GetDeviceName();
+    std::string             GetFirmwareVersion();
+    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:
+    std::string             device_name;
+    uint8_t                 active_zone;
+    uint8_t                 active_mode;
+    uint8_t                 active_speed;
+    i2c_smbus_interface*    bus;
+    polychrome_dev_id       dev;
+};

Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController.cpp

@@ -0,0 +1,308 @@
+/*-----------------------------------------*\
+|  ASRockPolychromeV1SMBusController.cpp    |
+|                                           |
+|  Driver for for ASRock ASR LED and        |
+|  Polychrome RGB lighting controller       |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/14/2019  |
+\*-----------------------------------------*/
+
+#include "ASRockPolychromeV1SMBusController.h"
+#include <cstring>
+#include "dependencies/dmiinfo.h"
+#include "LogManager.h"
+
+#define ASROCK_ZONE_LED_COUNT_MESSAGE_EN    "[%s] Zone %i LED count: %02d"
+
+using namespace std::chrono_literals;
+
+ASRockPolychromeV1SMBusController::ASRockPolychromeV1SMBusController(i2c_smbus_interface* bus, polychrome_dev_id dev)
+{
+    this->bus = bus;
+    this->dev = dev;
+
+    DMIInfo dmi;
+    device_name =   "ASRock " + dmi.getMainboard();
+
+    ReadLEDConfiguration();
+}
+
+ASRockPolychromeV1SMBusController::~ASRockPolychromeV1SMBusController()
+{
+
+}
+
+std::string ASRockPolychromeV1SMBusController::GetDeviceLocation()
+{
+    std::string return_string(bus->device_name);
+    char addr[5];
+    snprintf(addr, 5, "0x%02X", dev);
+    return_string.append(", address ");
+    return_string.append(addr);
+    return("I2C: " + return_string);
+}
+
+std::string ASRockPolychromeV1SMBusController::GetDeviceName()
+{
+    return(device_name);
+}
+
+std::string ASRockPolychromeV1SMBusController::GetFirmwareVersion()
+{
+    uint8_t  major_version = fw_version >> 8;
+    uint8_t  minor_version = fw_version & 0xFF;
+
+    return(std::to_string(major_version) + "." + std::to_string(minor_version));
+}
+
+void ASRockPolychromeV1SMBusController::ReadLEDConfiguration()
+{
+    /*---------------------------------------------------------------------------------*\
+    | The LED configuration register holds 6 bytes, so the first read should return 6   |
+    | If not, set all zone sizes to zero                                                |
+    \*---------------------------------------------------------------------------------*/
+    LOG_DEBUG("[%s] Reading Zone sizes from controller", device_name.c_str());
+    uint8_t asrock_zone_count[I2C_SMBUS_BLOCK_MAX] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 };
+    if (bus->i2c_smbus_read_block_data(dev, POLYCHROME_V1_REG_ZONE_SIZE, asrock_zone_count) == 0x06)
+    {
+        zone_led_count[POLYCHROME_V1_ZONE_1]           = asrock_zone_count[0];
+        zone_led_count[POLYCHROME_V1_ZONE_2]           = asrock_zone_count[1];
+        zone_led_count[POLYCHROME_V1_ZONE_3]           = asrock_zone_count[2];
+        zone_led_count[POLYCHROME_V1_ZONE_4]           = asrock_zone_count[3];
+        zone_led_count[POLYCHROME_V1_ZONE_5]           = asrock_zone_count[4];
+        zone_led_count[POLYCHROME_V1_ZONE_ADDRESSABLE] = asrock_zone_count[5];
+        LOG_DEBUG(ASROCK_ZONE_LED_COUNT_MESSAGE_EN, device_name.c_str(), POLYCHROME_V1_ZONE_1, zone_led_count[POLYCHROME_V1_ZONE_1]);
+        LOG_DEBUG(ASROCK_ZONE_LED_COUNT_MESSAGE_EN, device_name.c_str(), POLYCHROME_V1_ZONE_2, zone_led_count[POLYCHROME_V1_ZONE_2]);
+        LOG_DEBUG(ASROCK_ZONE_LED_COUNT_MESSAGE_EN, device_name.c_str(), POLYCHROME_V1_ZONE_3, zone_led_count[POLYCHROME_V1_ZONE_3]);
+        LOG_DEBUG(ASROCK_ZONE_LED_COUNT_MESSAGE_EN, device_name.c_str(), POLYCHROME_V1_ZONE_4, zone_led_count[POLYCHROME_V1_ZONE_4]);
+        LOG_DEBUG(ASROCK_ZONE_LED_COUNT_MESSAGE_EN, device_name.c_str(), POLYCHROME_V1_ZONE_5, zone_led_count[POLYCHROME_V1_ZONE_5]);
+        LOG_DEBUG("[%s] Addressable Zone LED count: %02d", device_name.c_str(), zone_led_count[POLYCHROME_V1_ZONE_ADDRESSABLE]);
+    }
+    else
+    {
+        LOG_WARNING("[%s] LED config read failed", device_name.c_str());
+        memset(zone_led_count, 0, sizeof(zone_led_count));
+    }
+}
+
+uint8_t ASRockPolychromeV1SMBusController::GetARGBColorOrder()
+{
+    uint8_t temp[1] = { 0x00 };
+    LOG_TRACE("[%s] Reading ARGB color order config from the controller", device_name.c_str());
+
+    //Read the data
+    if(bus->i2c_smbus_read_block_data(dev, POLYCHROME_V1_REG_ARGB_GRB, temp) == 0x01)
+    {
+        if(temp[0] == 1)
+        {
+            LOG_DEBUG("[%s] Color order is GRB for the ARGB header", device_name.c_str());
+        }
+        else
+        {
+            LOG_DEBUG("[%s] Color order is RGB for the ARGB header", device_name.c_str());
+        }
+        return temp[0];
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+RGBColor ASRockPolychromeV1SMBusController::GetZoneColor(uint8_t zone)
+{
+    LOG_TRACE("[%s] Reading color from zone %02d", device_name.c_str(), zone);
+    return zone_config[zone].color;
+}
+
+uint8_t ASRockPolychromeV1SMBusController::GetZoneMode(uint8_t zone)
+{
+    LOG_TRACE("[%s] Retreving mode %02X from zone_modes for zone %02d", device_name.c_str(), zone_config[zone].mode, zone);
+    return(zone_config[zone].mode);
+}
+
+void ASRockPolychromeV1SMBusController::LoadZoneConfig()
+{
+    uint8_t zone[1] = { 0x00 };
+    uint8_t mode[1] = { 0xFF };
+    uint8_t color_speed_pkt[4] = { 0, 0, 0, 0 };
+
+    LOG_TRACE("[%s] Reading modes from all zones", device_name.c_str());
+    //Polychrome v1 supports per zone modes so we need to set the zone before we can read the mode.
+    //Write the zone index.
+
+    for(uint8_t zone_idx = 0 ; zone_idx < POLYCHROME_V1_ZONE_COUNT; zone_idx ++)
+    {
+        if(zone_led_count[zone_idx] > 0)
+        {
+            zone[0] = zone_idx;
+            bus->i2c_smbus_write_block_data(dev, POLYCHROME_V1_REG_ZONE_SELECT, 1, zone);
+
+            //Read the data back.
+            if(bus->i2c_smbus_read_block_data(dev, POLYCHROME_V1_REG_ZONE_SELECT, zone) == 0x01)
+            {
+                //Validate that we changed correctly.
+                if(zone[0] == zone_idx)
+                {
+                    //Read the mode for the zone.
+                    if(bus->i2c_smbus_read_block_data(dev, POLYCHROME_V1_REG_MODE, mode) == 0x01)
+                    {
+                        LOG_DEBUG("[%s] Mode 0x%02x for zone %02d", device_name.c_str(), mode[0], zone_idx);
+                        zone_config[zone_idx].mode = mode[0];
+
+                        bus->i2c_smbus_read_block_data(dev, zone_config[zone_idx].mode, color_speed_pkt);
+
+                        zone_config[zone_idx].color = color_speed_pkt[0] << 16 | color_speed_pkt[1] << 8 | color_speed_pkt[2];
+                        zone_config[zone_idx].speed = color_speed_pkt [3];
+
+                        LOG_TRACE("[%s] Mode config: %06X, %02X", device_name.c_str(), zone_config[zone_idx].color, zone_config[zone_idx].speed );
+                    }
+                }
+                else
+                {
+                    LOG_WARNING("[%s] Zone mode register failed to change!", device_name.c_str() );
+                }
+            }
+        }
+        else
+        {
+            zone_config[zone_idx].mode = 0;
+            zone_config[zone_idx].color = 0;
+            zone_config[zone_idx].speed = 0;
+        }
+    }
+}
+
+void ASRockPolychromeV1SMBusController::SetARGBColorOrder(bool value)
+{
+    uint8_t temp[1] = { 0x00 };
+
+    LOG_TRACE("[%s] Setting ARGB color order config to the controller", device_name.c_str());
+
+    temp[0] = (value) ? 0x01 : 0x00;
+    bus->i2c_smbus_write_block_data(dev, POLYCHROME_V1_REG_ARGB_GRB, 1, temp);
+    GetARGBColorOrder();
+}
+
+bool ASRockPolychromeV1SMBusController::SetARGBSize(uint8_t new_size)
+{
+    LOG_DEBUG("[%s] Setting ARGB header to %02d.", device_name.c_str(), new_size);
+
+    uint8_t asrock_zone_count[6] = { 0x0 };
+    uint8_t new_asrock_zone_count[6] = { 0x0 };
+
+    //memcpy(new_asrock_zone_count, zone_led_count, sizeof(new_asrock_zone_count - 1));
+    new_asrock_zone_count[POLYCHROME_V1_ZONE_1] = zone_led_count[POLYCHROME_V1_ZONE_1];
+    new_asrock_zone_count[POLYCHROME_V1_ZONE_2] = zone_led_count[POLYCHROME_V1_ZONE_2];
+    new_asrock_zone_count[POLYCHROME_V1_ZONE_3] = zone_led_count[POLYCHROME_V1_ZONE_3];
+    new_asrock_zone_count[POLYCHROME_V1_ZONE_4] = zone_led_count[POLYCHROME_V1_ZONE_4];
+    new_asrock_zone_count[POLYCHROME_V1_ZONE_5] = zone_led_count[POLYCHROME_V1_ZONE_5];
+    new_asrock_zone_count[POLYCHROME_V1_ZONE_ADDRESSABLE] = new_size;
+
+    //Write the new config to the register
+    bus->i2c_smbus_write_block_data(dev, POLYCHROME_V1_REG_ZONE_SIZE, 6, new_asrock_zone_count);
+
+    //Validate the write
+    if (bus->i2c_smbus_read_block_data(dev, POLYCHROME_V1_REG_ZONE_SIZE, asrock_zone_count) == 0x06)
+    {
+        for (uint8_t i = 0; i < 6; i++)
+        {
+            if (new_asrock_zone_count[i] != asrock_zone_count[i])
+            {
+                LOG_WARNING("[%s] Failed to validate zone %02d size!", device_name.c_str(), i);
+                return false;
+            }
+        }
+        LOG_DEBUG("[%s] Zone configuration validation completed.", device_name.c_str());
+        return true;
+    }
+    return false;
+}
+
+void ASRockPolychromeV1SMBusController::SetColorsAndSpeed(uint8_t zone, uint8_t red, uint8_t green, uint8_t blue)
+{
+    LOG_TRACE("[%s] Updating color and speed for zone %02d: 0x%06X", device_name.c_str(), zone, (red << 16 | green << 8 | blue));
+    uint8_t color_speed_pkt[4] = { red, green, blue, zone_config[zone].speed };
+    uint8_t select_zone_pkt[1]  = { zone };
+
+    /*-----------------------------------------------------*\
+    | Select Zone                                           |
+    \*-----------------------------------------------------*/
+    if(zone_config[zone].mode != POLYCHROME_V1_MODE_OFF)
+    {
+        bus->i2c_smbus_write_block_data(dev, POLYCHROME_V1_REG_ZONE_SELECT, 1, select_zone_pkt);
+        std::this_thread::sleep_for(1ms);
+    }
+
+    switch(zone_config[zone].mode)
+    {
+        /*-----------------------------------------------------*\
+        | These modes take 4 bytes in R/G/B/S order             |
+        \*-----------------------------------------------------*/
+        case POLYCHROME_V1_MODE_BREATHING:
+        case POLYCHROME_V1_MODE_STROBE:
+        case POLYCHROME_V1_MODE_SPECTRUM_CYCLE:
+        case POLYCHROME_V1_MODE_SPRING:
+        case POLYCHROME_V1_MODE_METEOR:
+        case POLYCHROME_V1_MODE_STACK:
+        case POLYCHROME_V1_MODE_CRAM:
+        case POLYCHROME_V1_MODE_SCAN:
+        case POLYCHROME_V1_MODE_NEON:
+        case POLYCHROME_V1_MODE_WATER:
+
+            bus->i2c_smbus_write_block_data(dev, zone_config[zone].mode, 4, color_speed_pkt);
+            break;
+
+        /*-----------------------------------------------------*\
+        | These modes take 3 bytes in R/G/B order               |
+        \*-----------------------------------------------------*/
+        default:
+        case POLYCHROME_V1_MODE_STATIC:
+        case POLYCHROME_V1_MODE_MUSIC:
+            bus->i2c_smbus_write_block_data(dev, zone_config[zone].mode, 3, color_speed_pkt);
+            break;
+
+        /*-----------------------------------------------------*\
+        | These modes take 1 byte - speed                       |
+        \*-----------------------------------------------------*/
+        case POLYCHROME_V1_MODE_RANDOM:
+        case POLYCHROME_V1_MODE_WAVE:
+        case POLYCHROME_V1_MODE_RAINBOW:
+            bus->i2c_smbus_write_block_data(dev, zone_config[zone].mode, 1, &zone_config[zone].speed);
+            break;
+
+        /*-----------------------------------------------------*\
+        | These modes take no bytes                             |
+        \*-----------------------------------------------------*/
+        case POLYCHROME_V1_MODE_OFF:
+            break;
+    }
+    std::this_thread::sleep_for(1ms);
+
+}
+
+void ASRockPolychromeV1SMBusController::SetMode(uint8_t zone, uint8_t mode, uint8_t speed)
+{
+    LOG_TRACE("[%s] Updating mode for zone %02d, Mode 0x%02X, Speed 0x%02X", device_name.c_str(), zone, mode, speed);
+    uint8_t led_count_pkt[1]    = { 0x00 };
+    zone_config[zone].mode      = mode;
+    zone_config[zone].speed     = speed;
+
+    /*-----------------------------------------------------*\
+    | Make sure set all register is set to 0                |
+    \*-----------------------------------------------------*/
+    bus->i2c_smbus_write_block_data(dev, POLYCHROME_V1_REG_SET_ALL, 1, led_count_pkt);
+    std::this_thread::sleep_for(1ms);
+
+    /*-----------------------------------------------------*\
+    | Set the zone we are working on                        |
+    \*-----------------------------------------------------*/
+    bus->i2c_smbus_write_block_data(dev, POLYCHROME_V1_REG_ZONE_SELECT, 1, &zone);
+    std::this_thread::sleep_for(1ms);
+
+    /*-----------------------------------------------------*\
+    | Write the mode                                        |
+    \*-----------------------------------------------------*/
+    bus->i2c_smbus_write_block_data(dev, POLYCHROME_V1_REG_MODE, 1, &zone_config[zone].mode);
+    std::this_thread::sleep_for(1ms);
+}

Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController.h

@@ -0,0 +1,159 @@
+/*-----------------------------------------*\
+|  ASRockPolychromeV1SMBusController.h      |
+|                                           |
+|  Definitions and types for ASRock         |
+|  ASR LED and Polychrome RGB lighting      |
+|  controller                               |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/13/2019  |
+\*-----------------------------------------*/
+
+#include "i2c_smbus.h"
+#include "RGBController.h"
+#include <string>
+
+#pragma once
+
+typedef uint8_t	polychrome_dev_id;
+
+#define ASROCK_V1_CONTROLLER_NAME  "ASRock Polychrome v1 SMBus Controller"
+
+enum
+{
+    /*------------------------------------------------------------------------------------------*\
+    | ASRock Polychrome v1 Registers                                                             |
+    \*------------------------------------------------------------------------------------------*/
+    POLYCHROME_V1_REG_FIRMWARE_VER          = 0x00,     /* Firmware version Major.Minor         */
+    POLYCHROME_V1_REG_MODE                  = 0x30,     /* Mode selection register              */
+    POLYCHROME_V1_REG_ZONE_SELECT           = 0x31,     /* Zone selection register              */
+    POLYCHROME_V1_REG_SET_ALL               = 0x32,     /* Set All register 0x1 = set all       */
+    POLYCHROME_V1_REG_ZONE_SIZE             = 0x33,     /* Zone size configuration register     */
+    POLYCHROME_V1_REG_ARGB_GRB              = 0x35,     /* ARGB bitstream reversing register    */
+};
+
+enum
+{
+    POLYCHROME_V1_ZONE_1                    = 0x00,     /* RGB LED 1 Header                     */
+    POLYCHROME_V1_ZONE_2                    = 0x01,     /* RGB LED 2 Header                     */
+    POLYCHROME_V1_ZONE_3                    = 0x02,     /* PCH Zone                             */
+    POLYCHROME_V1_ZONE_4                    = 0x03,     /* IO Cover Zone                        */
+    POLYCHROME_V1_ZONE_5                    = 0x04,     /* Audio Zone LEDs                      */
+    POLYCHROME_V1_ZONE_ADDRESSABLE          = 0x05,     /* Addressable LED header               */
+    POLYCHROME_V1_ZONE_COUNT                = 0x06,     /* Total number of zones                */
+    POLYCHROME_V1_ZONE_ADDRESSABLE_MAX      = 0x64,     /* Maximum number of ARGB LEDs          */
+};
+
+/*----------------------------------------------------------------------------------------------*\
+| Definitions for Polychrome V1                                                                  |
+\*----------------------------------------------------------------------------------------------*/
+#define POLYCHROME_V1_NUM_MODES             16          /* Number of Polychrome V1 modes        */
+
+enum
+{
+    POLYCHROME_V1_MODE_OFF                  = 0x10,     /* OFF mode                             */
+    POLYCHROME_V1_MODE_STATIC               = 0x11,     /* Static color mode                    */
+    POLYCHROME_V1_MODE_BREATHING            = 0x12,     /* Breathing effect mode                */
+    POLYCHROME_V1_MODE_STROBE               = 0x13,     /* Strobe effect mode                   */
+    POLYCHROME_V1_MODE_SPECTRUM_CYCLE       = 0x14,     /* Spectrum Cycle effect mode           */
+    POLYCHROME_V1_MODE_RANDOM               = 0x15,     /* Random effect mode                   */
+    POLYCHROME_V1_MODE_MUSIC                = 0x17,     /* Music effect mode                    */
+    POLYCHROME_V1_MODE_WAVE                 = 0x18,     /* Wave effect mode                     */
+    /*------------------------------------------------------------------------------------------*\
+    | Modes only available on ARGB headers                                                       |
+    \*------------------------------------------------------------------------------------------*/
+    POLYCHROME_V1_MODE_SPRING               = 0x19,     /* Spring effect mode                   */
+    POLYCHROME_V1_MODE_METEOR               = 0x1A,     /* Meteor effect mode                   */
+    POLYCHROME_V1_MODE_STACK                = 0x1B,     /* Stack effect mode                    */
+    POLYCHROME_V1_MODE_CRAM                 = 0x1C,     /* Cram effect mode                     */
+    POLYCHROME_V1_MODE_SCAN                 = 0x1D,     /* Scan effect mode                     */
+    POLYCHROME_V1_MODE_NEON                 = 0x1E,     /* Neon effect mode                     */
+    POLYCHROME_V1_MODE_WATER                = 0x1F,     /* Water effect mode                    */
+    POLYCHROME_V1_MODE_RAINBOW              = 0x20,     /* Rainbow chase effect mode            */
+};
+
+enum
+{
+    /*------------------------------------------------------------------------------------------*\
+    | POLYCHROME_V1_MODE_BREATHING                                                               |
+    \*------------------------------------------------------------------------------------------*/
+    POLYCHROME_V1_SPEED_MIN_BREATHING       = 0x0A,     /* Slowest speed                        */
+    POLYCHROME_V1_SPEED_DEFAULT_BREATHING   = 0x02,     /* Default speed                        */
+    POLYCHROME_V1_SPEED_MAX_BREATHING       = 0x02,     /* Fastest speed                        */
+    /*------------------------------------------------------------------------------------------*\
+    | POLYCHROME_V1_MODE_STROBE                                                                  |
+    \*------------------------------------------------------------------------------------------*/
+    POLYCHROME_V1_SPEED_MIN_STROBE          = 0xA0,     /* Slowest speed                        */
+    POLYCHROME_V1_SPEED_DEFAULT_STROBE      = 0x14,     /* Default speed                        */
+    POLYCHROME_V1_SPEED_MAX_STROBE          = 0x05,     /* Fastest speed                        */
+    /*------------------------------------------------------------------------------------------*\
+    | POLYCHROME_V1_MODE_SPECTRUM_CYCLE                                                          |
+    \*------------------------------------------------------------------------------------------*/
+    POLYCHROME_V1_SPEED_MIN_CYCLE           = 0xA0,     /* Slowest speed                        */
+    POLYCHROME_V1_SPEED_DEFAULT_CYCLE       = 0x14,     /* Default speed                        */
+    POLYCHROME_V1_SPEED_MAX_CYCLE           = 0x0A,     /* Fastest speed                        */
+    /*------------------------------------------------------------------------------------------*\
+    | POLYCHROME_V1_MODE_RANDOM                                                                  |
+    \*------------------------------------------------------------------------------------------*/
+    POLYCHROME_V1_SPEED_MIN_RANDOM          = 0xA0,     /* Slowest speed                        */
+    POLYCHROME_V1_SPEED_DEFAULT_RANDOM      = 0x28,     /* Default speed                        */
+    POLYCHROME_V1_SPEED_MAX_RANDOM          = 0x05,     /* Fastest speed                        */
+    /*------------------------------------------------------------------------------------------*\
+    | POLYCHROME_V1_MODE_WAVE                                                                    |
+    \*------------------------------------------------------------------------------------------*/
+    POLYCHROME_V1_SPEED_MIN_WAVE            = 0x06,     /* Slowest speed                        */
+    POLYCHROME_V1_SPEED_DEFAULT_WAVE        = 0x02,     /* Default speed                        */
+    POLYCHROME_V1_SPEED_MAX_WAVE            = 0x01,     /* Fastest speed                        */
+    POLYCHROME_V1_SPEED_DEFAULT_SPRING      = 0x04,     /* Default speed                        */
+    POLYCHROME_V1_SPEED_DEFAULT_METEOR      = 0x0A,     /* Default speed                        */
+    POLYCHROME_V1_SPEED_DEFAULT_STACK       = 0x04,     /* Default speed                        */
+    POLYCHROME_V1_SPEED_DEFAULT_CRAM        = 0x04,     /* Default speed                        */
+    POLYCHROME_V1_SPEED_DEFAULT_SCAN        = 0x0A,     /* Default speed                        */
+    POLYCHROME_V1_SPEED_DEFAULT_NEON        = 0x20,     /* Default speed                        */
+    POLYCHROME_V1_SPEED_DEFAULT_WATER       = 0x0A,     /* Default speed                        */
+    /*------------------------------------------------------------------------------------------*\
+    | POLYCHROME_V1_MODE_RAINBOW                                                                 |
+    \*------------------------------------------------------------------------------------------*/
+    POLYCHROME_V1_SPEED_MIN_RAINBOW         = 0x12,     /* Slowest speed                        */
+    POLYCHROME_V1_SPEED_DEFAULT_RAINBOW     = 0x0A,     /* Default speed                        */
+    POLYCHROME_V1_SPEED_MAX_RAINBOW         = 0x01,     /* Fastest speed                        */
+    POLYCHROME_V1_SPEED_MIN_ARGB            = 0x20,     /* Slowest speed                        */
+    POLYCHROME_V1_SPEED_MAX_ARGB            = 0x02,     /* Fastest speed                        */
+};
+
+struct zone_cfg
+{
+    uint8_t     mode;
+    uint8_t     speed;
+    RGBColor    color;
+};
+
+class ASRockPolychromeV1SMBusController
+{
+public:
+    ASRockPolychromeV1SMBusController(i2c_smbus_interface* bus, polychrome_dev_id dev);
+    ~ASRockPolychromeV1SMBusController();
+
+    std::string             GetDeviceLocation();
+    std::string             GetDeviceName();
+    std::string             GetFirmwareVersion();
+
+    uint8_t                 GetARGBColorOrder();
+    RGBColor                GetZoneColor(uint8_t zone);
+    uint8_t                 GetZoneMode(uint8_t zone);
+    void                    LoadZoneConfig();
+    void                    SetARGBColorOrder(bool value);
+    bool                    SetARGBSize(uint8_t led_count);
+    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);
+
+    uint8_t                 zone_led_count[6];
+    zone_cfg                zone_config[6];
+    uint16_t                fw_version;
+
+private:
+    std::string             device_name;
+    i2c_smbus_interface*    bus;
+    polychrome_dev_id       dev;
+
+    void                    ReadLEDConfiguration();
+};

Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController.cpp

@@ -0,0 +1,156 @@
+/*-----------------------------------------*\
+|  ASRockPolychromeV2SMBusController.cpp    |
+|                                           |
+|  Driver for for ASRock ASR LED and        |
+|  Polychrome RGB lighting controller       |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/14/2019  |
+\*-----------------------------------------*/
+
+#include "ASRockPolychromeV2SMBusController.h"
+#include <cstring>
+#include "dependencies/dmiinfo.h"
+#include "LogManager.h"
+
+#define ASROCK_ZONE_LED_COUNT_MESSAGE_EN    "[%s] Zone %i LED count: %02d"
+
+using namespace std::chrono_literals;
+
+ASRockPolychromeV2SMBusController::ASRockPolychromeV2SMBusController(i2c_smbus_interface* bus, polychrome_dev_id dev)
+{
+    this->bus = bus;
+    this->dev = dev;
+
+    DMIInfo dmi;
+
+    device_name =   "ASRock " + dmi.getMainboard();
+
+    ReadLEDConfiguration();
+}
+
+ASRockPolychromeV2SMBusController::~ASRockPolychromeV2SMBusController()
+{
+
+}
+
+std::string ASRockPolychromeV2SMBusController::GetDeviceLocation()
+{
+    std::string return_string(bus->device_name);
+    char addr[5];
+    snprintf(addr, 5, "0x%02X", dev);
+    return_string.append(", address ");
+    return_string.append(addr);
+    return("I2C: " + return_string);
+}
+
+std::string ASRockPolychromeV2SMBusController::GetDeviceName()
+{
+    return(device_name);
+}
+
+std::string ASRockPolychromeV2SMBusController::GetFirmwareVersion()
+{
+    uint8_t  major_version = fw_version >> 8;
+    uint8_t  minor_version = fw_version & 0xFF;
+
+    return(std::to_string(major_version) + "." + std::to_string(minor_version));
+}
+
+
+void ASRockPolychromeV2SMBusController::ReadLEDConfiguration()
+{
+    /*---------------------------------------------------------------------------------*\
+    | The LED configuration register holds 6 bytes, so the first read should return 6   |
+    | If not, set all zone sizes to zero                                                |
+    \*---------------------------------------------------------------------------------*/
+    LOG_DEBUG("[%s] Reading LED config from controller", device_name.c_str());
+    uint8_t asrock_zone_count[I2C_SMBUS_BLOCK_MAX] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 };
+    if (bus->i2c_smbus_read_block_data(dev, POLYCHROME_V2_REG_LED_CONFIG, asrock_zone_count) == 0x06)
+    {
+        zone_led_count[POLYCHROME_V2_ZONE_1]           = asrock_zone_count[0];
+        zone_led_count[POLYCHROME_V2_ZONE_2]           = asrock_zone_count[1];
+        zone_led_count[POLYCHROME_V2_ZONE_3]           = asrock_zone_count[2];
+        zone_led_count[POLYCHROME_V2_ZONE_4]           = asrock_zone_count[3];
+        zone_led_count[POLYCHROME_V2_ZONE_5]           = asrock_zone_count[4];
+        zone_led_count[POLYCHROME_V2_ZONE_ADDRESSABLE] = asrock_zone_count[5];
+        LOG_DEBUG(ASROCK_ZONE_LED_COUNT_MESSAGE_EN, device_name.c_str(), POLYCHROME_V2_ZONE_1, zone_led_count[POLYCHROME_V2_ZONE_1]);
+        LOG_DEBUG(ASROCK_ZONE_LED_COUNT_MESSAGE_EN, device_name.c_str(), POLYCHROME_V2_ZONE_2, zone_led_count[POLYCHROME_V2_ZONE_2]);
+        LOG_DEBUG(ASROCK_ZONE_LED_COUNT_MESSAGE_EN, device_name.c_str(), POLYCHROME_V2_ZONE_3, zone_led_count[POLYCHROME_V2_ZONE_3]);
+        LOG_DEBUG(ASROCK_ZONE_LED_COUNT_MESSAGE_EN, device_name.c_str(), POLYCHROME_V2_ZONE_4, zone_led_count[POLYCHROME_V2_ZONE_4]);
+        LOG_DEBUG(ASROCK_ZONE_LED_COUNT_MESSAGE_EN, device_name.c_str(), POLYCHROME_V2_ZONE_5, zone_led_count[POLYCHROME_V2_ZONE_5]);
+        LOG_DEBUG("[%s] Addressable Zone LED count: %02d", device_name.c_str(), zone_led_count[POLYCHROME_V2_ZONE_ADDRESSABLE]);
+    }
+    else
+    {
+        LOG_WARNING("[%s] LED config read failed", device_name.c_str());
+        memset(zone_led_count, 0, sizeof(zone_led_count));
+    }
+}
+
+uint8_t ASRockPolychromeV2SMBusController::GetMode()
+{
+    return(active_mode);
+}
+
+void ASRockPolychromeV2SMBusController::SetColorsAndSpeed(uint8_t led, uint8_t red, uint8_t green, uint8_t blue)
+{
+    uint8_t color_speed_pkt[4] = { red, green, blue, active_speed };
+    uint8_t select_led_pkt[1]  = { led };
+
+    /*-----------------------------------------------------*\
+    | Select LED                                            |
+    \*-----------------------------------------------------*/
+    switch(active_mode)
+    {
+        case POLYCHROME_V2_MODE_OFF:
+        case POLYCHROME_V2_MODE_RAINBOW:
+        case POLYCHROME_V2_MODE_SPECTRUM_CYCLE:
+            break;
+
+        default:
+            bus->i2c_smbus_write_block_data(dev, POLYCHROME_V2_REG_LED_SELECT, 1, select_led_pkt);
+            std::this_thread::sleep_for(1ms);
+
+            /*-----------------------------------------------------*\
+            | Polychrome firmware always writes color to fixed reg  |
+            \*-----------------------------------------------------*/
+            bus->i2c_smbus_write_block_data(dev, POLYCHROME_V2_REG_COLOR, 3, color_speed_pkt);
+            std::this_thread::sleep_for(1ms);
+            break;
+    }
+}
+
+void ASRockPolychromeV2SMBusController::SetMode(uint8_t zone,uint8_t mode, uint8_t speed)
+{
+    uint8_t       led_count_pkt[1]  = { 0x00 };
+    active_zone                     = zone;
+    active_mode                     = mode;
+    active_speed                    = speed;
+
+    bus->i2c_smbus_write_block_data(dev, POLYCHROME_V2_REG_MODE, 1, &active_mode);
+    std::this_thread::sleep_for(1ms);
+
+    /*-----------------------------------------------------*\
+    | Select a single LED                                   |
+    \*-----------------------------------------------------*/
+    bus->i2c_smbus_write_block_data(dev, POLYCHROME_V2_REG_LED_COUNT, 0, led_count_pkt);
+    std::this_thread::sleep_for(1ms);
+
+    switch(active_mode)
+    {
+        /*-----------------------------------------------------*\
+        | These modes don't take a speed                        |
+        \*-----------------------------------------------------*/
+        case POLYCHROME_V2_MODE_OFF:
+        case POLYCHROME_V2_MODE_STATIC:
+            break;
+
+        /*-----------------------------------------------------*\
+        | All other modes, write speed to active mode register  |
+        \*-----------------------------------------------------*/
+        default:
+            bus->i2c_smbus_write_block_data(dev, active_mode, 1, &speed);
+            std::this_thread::sleep_for(1ms);
+            break;
+    }
+}

Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController.h

@@ -0,0 +1,145 @@
+/*-----------------------------------------*\
+|  ASRockPolychromeSMBusController.h        |
+|                                           |
+|  Definitions and types for ASRock         |
+|  ASR LED and Polychrome RGB lighting      |
+|  controller                               |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/13/2019  |
+\*-----------------------------------------*/
+
+#include "i2c_smbus.h"
+#include <string>
+
+#pragma once
+
+typedef uint8_t polychrome_dev_id;
+
+#define ASROCK_V2_CONTROLLER_NAME  "ASRock Polychrome v2 SMBus Controller"
+
+enum
+{
+    /*------------------------------------------------------------------------------------------*\
+    | ASRock Polychrome v2 Registers                                                             |
+    \*------------------------------------------------------------------------------------------*/
+    POLYCHROME_V2_REG_FIRMWARE_VER          = 0x00,     /* Firmware version Major.Minor         */
+    POLYCHROME_V2_REG_MODE                  = 0x30,     /* Mode selection register              */
+    POLYCHROME_V2_REG_LED_SELECT            = 0x31,     /* LED selection register               */
+    POLYCHROME_V2_REG_LED_COUNT             = 0x32,     /* Additional LED count register        */
+    POLYCHROME_V2_REG_LED_CONFIG            = 0x33,     /* LED configuration register           */
+    POLYCHROME_V2_REG_COLOR                 = 0x34,     /* Color register: Red, Green, Blue     */
+    POLYCHROME_V2_REG_ARGB_GRB              = 0x35,     /* ARGB bistream reversing register     */
+};
+
+enum
+{
+    POLYCHROME_V2_ZONE_1                    = 0x00,     /* RGB LED 1 Header                     */
+    POLYCHROME_V2_ZONE_2                    = 0x01,     /* RGB LED 2 Header                     */
+    POLYCHROME_V2_ZONE_3                    = 0x02,     /* Audio/PCH Zone LEDs                  */
+    POLYCHROME_V2_ZONE_4                    = 0x03,     /* Audio/PCH Zone LEDs                  */
+    POLYCHROME_V2_ZONE_5                    = 0x04,     /* IO Cover Zone LEDs                   */
+    POLYCHROME_V2_ZONE_ADDRESSABLE          = 0x05,     /* Addressable LED header               */
+    POLYCHROME_V2_ZONE_COUNT                = 0x06,     /* Total number of zones                */
+    POLYCHROME_V2_ZONE_ADDRESSABLE_MAX      = 0x64,     /* Maxinum number of ARGB LEDs          */
+};
+
+/*----------------------------------------------------------------------------------------------*\
+| Definitions for Polychrome V2                                                                  |
+\*----------------------------------------------------------------------------------------------*/
+#define POLYCHROME_V2_NUM_MODES             14          /* Number of Polychrome V2 modes        */
+
+enum
+{
+    POLYCHROME_V2_MODE_OFF                  = 0x10,     /* OFF mode                             */
+    POLYCHROME_V2_MODE_STATIC               = 0x11,     /* Static color mode                    */
+    POLYCHROME_V2_MODE_BREATHING            = 0x12,     /* Breating effect mode                 */
+    POLYCHROME_V2_MODE_STROBE               = 0x13,     /* Strobe effect mode                   */
+    POLYCHROME_V2_MODE_SPECTRUM_CYCLE       = 0x14,     /* Spectrum Cycle effect mode           */
+    POLYCHROME_V2_MODE_RANDOM               = 0x15,     /* Random effect mode                   */
+    POLYCHROME_V2_MODE_WAVE                 = 0x17,     /* Wave effect mode                     */
+    POLYCHROME_V2_MODE_SPRING               = 0x18,     /* Spring effect mode                   */
+    POLYCHROME_V2_MODE_STACK                = 0x19,     /* Stack effect mode                    */
+    POLYCHROME_V2_MODE_CRAM                 = 0x1A,     /* Cram effect mode                     */
+    POLYCHROME_V2_MODE_SCAN                 = 0x1B,     /* Scan effect mode                     */
+    POLYCHROME_V2_MODE_NEON                 = 0x1C,     /* Neon effect mode                     */
+    POLYCHROME_V2_MODE_WATER                = 0x1D,     /* Water effect mode                    */
+    POLYCHROME_V2_MODE_RAINBOW              = 0x1E,     /* Rainbow effect mode                  */
+};
+
+enum
+{
+    POLYCHROME_V2_BREATHING_SPEED_MIN               = 0x0A,     /* Slowest speed                        */
+    POLYCHROME_V2_BREATHING_SPEED_DEFAULT           = 0x06,     /* Default speed                        */
+    POLYCHROME_V2_BREATHING_SPEED_MAX               = 0x02,     /* Fastest speed                        */
+
+    POLYCHROME_V2_STROBE_SPEED_MIN                  = 0xA0,     /* Slowest speed                        */
+    POLYCHROME_V2_STROBE_SPEED_DEFAULT              = 0x4D,     /* Default speed                        */
+    POLYCHROME_V2_STROBE_SPEED_MAX                  = 0x05,     /* Fastest speed                        */
+
+    POLYCHROME_V2_SPECTRUM_CYCLE_SPEED_MIN          = 0xA0,     /* Slowest speed                        */
+    POLYCHROME_V2_SPECTRUM_CYCLE_SPEED_DEFAULT      = 0x50,     /* Default speed                        */
+    POLYCHROME_V2_SPECTRUM_CYCLE_SPEED_MAX          = 0x0A,     /* Fastest speed                        */
+
+    POLYCHROME_V2_RANDOM_SPEED_MIN                  = 0xA0,     /* Slowest speed                        */
+    POLYCHROME_V2_RANDOM_SPEED_DEFAULT              = 0x4D,     /* Default speed                        */
+    POLYCHROME_V2_RANDOM_SPEED_MAX                  = 0x05,     /* Fastest speed                        */
+
+    POLYCHROME_V2_WAVE_SPEED_MIN                    = 0x06,     /* Slowest speed                        */
+    POLYCHROME_V2_WAVE_SPEED_DEFAULT                = 0x03,     /* Default speed                        */
+    POLYCHROME_V2_WAVE_SPEED_MAX                    = 0x01,     /* Fastest speed                        */
+
+    POLYCHROME_V2_SPRING_SPEED_MIN                  = 0x20,     /* Slowest speed                        */
+    POLYCHROME_V2_SPRING_SPEED_DEFAULT              = 0x11,     /* Default speed                        */
+    POLYCHROME_V2_SPRING_SPEED_MAX                  = 0x02,     /* Fastest speed                        */
+
+    POLYCHROME_V2_STACK_SPEED_MIN                   = 0x20,     /* Slowest speed                        */
+    POLYCHROME_V2_STACK_SPEED_DEFAULT               = 0x11,     /* Default speed                        */
+    POLYCHROME_V2_STACK_SPEED_MAX                   = 0x02,     /* Fastest speed                        */
+
+    POLYCHROME_V2_CRAM_SPEED_MIN                    = 0x20,     /* Slowest speed                        */
+    POLYCHROME_V2_CRAM_SPEED_DEFAULT                = 0x11,     /* Default speed                        */
+    POLYCHROME_V2_CRAM_SPEED_MAX                    = 0x02,     /* Fastest speed                        */
+
+    POLYCHROME_V2_SCAN_SPEED_MIN                    = 0x20,     /* Slowest speed                        */
+    POLYCHROME_V2_SCAN_SPEED_DEFAULT                = 0x11,     /* Default speed                        */
+    POLYCHROME_V2_SCAN_SPEED_MAX                    = 0x02,     /* Fastest speed                        */
+
+    POLYCHROME_V2_NEON_SPEED_MIN                    = 0x20,     /* Slowest speed                        */
+    POLYCHROME_V2_NEON_SPEED_DEFAULT                = 0x11,     /* Default speed                        */
+    POLYCHROME_V2_NEON_SPEED_MAX                    = 0x02,     /* Fastest speed                        */
+
+    POLYCHROME_V2_WATER_SPEED_MIN                   = 0x20,     /* Slowest speed                        */
+    POLYCHROME_V2_WATER_SPEED_DEFAULT               = 0x11,     /* Default speed                        */
+    POLYCHROME_V2_WATER_SPEED_MAX                   = 0x02,     /* Fastest speed                        */
+
+    POLYCHROME_V2_RAINBOW_SPEED_MIN                 = 0x12,     /* Slowest speed                        */
+    POLYCHROME_V2_RAINBOW_SPEED_DEFAULT             = 0x08,     /* Default speed                        */
+    POLYCHROME_V2_RAINBOW_SPEED_MAX                 = 0x02,     /* Fastest speed                        */
+};
+
+class ASRockPolychromeV2SMBusController
+{
+public:
+    ASRockPolychromeV2SMBusController(i2c_smbus_interface* bus, polychrome_dev_id dev);
+    ~ASRockPolychromeV2SMBusController();
+
+    std::string             GetDeviceLocation();
+    std::string             GetDeviceName();
+    std::string             GetFirmwareVersion();
+    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);
+
+    uint8_t                 zone_led_count[6];
+    uint16_t                fw_version;
+    
+private:
+    std::string             device_name;
+    uint8_t                 active_zone;
+    uint8_t                 active_mode;
+    uint8_t                 active_speed;
+    i2c_smbus_interface*    bus;
+    polychrome_dev_id       dev;
+
+    void            ReadLEDConfiguration();
+};

Controllers/ASRockSMBusController/ASRockSMBusControllerDetect.cpp

@@ -0,0 +1,168 @@
+#include "Detector.h"
+#include "ASRockASRRGBSMBusController.h"
+#include "ASRockPolychromeV1SMBusController.h"
+#include "ASRockPolychromeV2SMBusController.h"
+#include "LogManager.h"
+#include "RGBController.h"
+#include "RGBController_ASRockASRRGBSMBus.h"
+#include "RGBController_ASRockPolychromeV1SMBus.h"
+#include "RGBController_ASRockPolychromeV2SMBus.h"
+#include "i2c_smbus.h"
+#include "pci_ids.h"
+#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
+
+/*******************************************************************************************\
+*                                                                                           *
+*   TestForPolychromeSMBusController                                                        *
+*                                                                                           *
+*       Tests the given address to see if an ASRock RGB controller exists there.            *
+*       First does a quick write to test for a response                                     *
+*                                                                                           *
+\*******************************************************************************************/
+
+#define ASROCK_DETECTOR_NAME        "ASRock SMBus Detectector"
+#define VENDOR_NAME                 "ASRock"
+#define SMBUS_ADDRESS               0x6A
+
+enum
+{
+    ASROCK_TYPE_UNKNOWN                     = 0x00,     /* Unknown Type or Not ASRock Device    */
+    ASROCK_TYPE_ASRLED                      = 0x01,     /* ASRock Firmware 1.x - ASR LED        */
+    ASROCK_TYPE_POLYCHROME_V1               = 0x02,     /* ASRock Firmware 2.x - Polychrome V1  */
+    ASROCK_TYPE_POLYCHROME_V2               = 0x03,     /* ASRock Firmware 3.x - Polychrome V2  */
+    ASROCK_REG_FIRMWARE_VER                 = 0x00,     /* Firmware version Major.Minor         */
+};
+
+union u16_to_u8
+{
+    uint16_t   u16;
+    struct
+    {
+        uint8_t lsb;
+        uint8_t msb;
+    };
+};
+
+bool TestForPolychromeSMBusController(i2c_smbus_interface* bus, uint8_t address)
+{
+    bool pass = false;
+
+    int res = bus->i2c_smbus_write_quick(address, I2C_SMBUS_WRITE);
+
+    if (res >= 0)
+    {
+        pass = true;
+    }
+
+    return(pass);
+
+}   /* TestForPolychromeController() */
+
+uint16_t GetFirmwareVersion(i2c_smbus_interface* bus, uint8_t address)
+{
+    // The firmware register holds two bytes, so the first read should return 2
+    // If not, report invalid firmware revision
+    LOG_DEBUG("[%s] Reading back device firmware version", ASROCK_DETECTOR_NAME);
+    u16_to_u8 asrock_version_u16;
+
+    // Version response array needs to be 32 bytes to prevent non ASRock board from stack smashing
+    uint8_t asrock_version[I2C_SMBUS_BLOCK_MAX] = { 0x00, 0x00 };
+
+    if (bus->i2c_smbus_read_block_data(address, ASROCK_REG_FIRMWARE_VER, asrock_version) == 0x02)
+    {
+        asrock_version_u16.msb = asrock_version[0];
+        asrock_version_u16.lsb = asrock_version[1];
+
+        LOG_DEBUG("[%s] Device firmware version: v%02d.%02d", ASROCK_DETECTOR_NAME, asrock_version_u16.msb, asrock_version_u16.lsb);
+        return(asrock_version_u16.u16);
+    }
+    else
+    {
+        LOG_WARNING("[%s] Firmware readback failed; Returning Unknown Version", ASROCK_DETECTOR_NAME);
+        return(ASROCK_TYPE_UNKNOWN);
+    }
+}
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectPolychromeControllers                                                            *
+*                                                                                          *
+*       Detect ASRock Polychrome RGB SMBus controllers on the enumerated I2C busses at     *
+*       address 0x6A.                                                                      *
+*                                                                                          *
+*           bus - pointer to i2c_smbus_interface where Polychrome device is connected      *
+*           dev - I2C address of Polychrome device                                         *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectASRockSMBusControllers(std::vector<i2c_smbus_interface*>& busses)
+{
+    for(unsigned int bus = 0; bus < busses.size(); bus++)
+    {
+        IF_MOBO_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device)
+        {
+            if(busses[bus]->pci_subsystem_vendor == ASROCK_SUB_VEN)
+            {
+                LOG_DEBUG(SMBUS_CHECK_DEVICE_MESSAGE_EN, ASROCK_DETECTOR_NAME, bus, VENDOR_NAME, SMBUS_ADDRESS);
+                // Check for Polychrome controller at 0x6A
+                if(TestForPolychromeSMBusController(busses[bus], SMBUS_ADDRESS))
+                {
+                    LOG_DEBUG("[%s] Detected a device at address 0x%02X, testing for a known controller",  ASROCK_DETECTOR_NAME, SMBUS_ADDRESS);
+
+                    u16_to_u8 version;
+                    version.u16 = GetFirmwareVersion(busses[bus], SMBUS_ADDRESS);
+
+                    switch (version.msb)
+                    {
+                        case ASROCK_TYPE_ASRLED:
+                            {
+                                LOG_DEBUG("[%s] Found a ASR RGB LED Controller", ASROCK_DETECTOR_NAME);
+                                ASRockASRRGBSMBusController* controller = new ASRockASRRGBSMBusController(busses[bus], SMBUS_ADDRESS);
+                                controller-> fw_version = version.u16;
+                                RGBController_ASRockASRRGBSMBus* rgb_controller = new RGBController_ASRockASRRGBSMBus(controller);
+                                ResourceManager::get()->RegisterRGBController(rgb_controller);
+                            }
+                            break;
+
+                            case ASROCK_TYPE_POLYCHROME_V1:
+                            {
+                                LOG_DEBUG("[%s] Found a Polychrome v1 Controller", ASROCK_DETECTOR_NAME);
+                                ASRockPolychromeV1SMBusController* controller = new ASRockPolychromeV1SMBusController(busses[bus], SMBUS_ADDRESS);
+                                controller-> fw_version = version.u16;
+                                RGBController_ASRockPolychromeV1SMBus* rgb_controller = new RGBController_ASRockPolychromeV1SMBus(controller);
+                                ResourceManager::get()->RegisterRGBController(rgb_controller);
+                            }
+                            break;
+
+                            case ASROCK_TYPE_POLYCHROME_V2:
+                            {
+                                LOG_DEBUG("[%s] Found a Polychrome v2 Controller", ASROCK_DETECTOR_NAME);
+                                ASRockPolychromeV2SMBusController* controller = new ASRockPolychromeV2SMBusController(busses[bus], SMBUS_ADDRESS);
+                                controller-> fw_version = version.u16;
+                                RGBController_ASRockPolychromeV2SMBus* rgb_controller = new RGBController_ASRockPolychromeV2SMBus(controller);
+                                ResourceManager::get()->RegisterRGBController(rgb_controller);
+                            }
+                            break;
+
+                            default:
+                                LOG_DEBUG("[%s] Not a Polychrome device or unknown type", ASROCK_DETECTOR_NAME);
+                                break;
+                    }
+                }
+                else
+                {
+                    LOG_DEBUG("[%s] Bus %02d has no response at 0x%02X", ASROCK_DETECTOR_NAME, bus, SMBUS_ADDRESS);
+                }
+            }
+            else
+            {
+                LOG_DEBUG(SMBUS_CHECK_DEVICE_FAILURE_EN, ASROCK_DETECTOR_NAME, bus, VENDOR_NAME);
+            }
+        }
+    }
+
+}   /* DetectSMBusPolychromeControllers() */
+
+REGISTER_I2C_DETECTOR("ASRock Motherboard SMBus Controllers", DetectASRockSMBusControllers);

Controllers/ASRockSMBusController/RGBController_ASRockASRRGBSMBus.cpp

@@ -0,0 +1,205 @@
+/*-----------------------------------------*\
+|  RGBController_ASRockPolychromeSMBus.cpp  |
+|                                           |
+|  Generic RGB Interface for OpenRGB        |
+|  ASRock ASR LED and Polychrome RGB Driver |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/15/2019  |
+\*-----------------------------------------*/
+
+#include "RGBController_ASRockASRRGBSMBus.h"
+
+#define ASROCK_MAX_ZONES    4
+#define ASROCK_MAX_LEDS     22
+
+/**------------------------------------------------------------------*\
+    @name ASRock ASR RGB SMBus
+    @category Motherboard
+    @type SMBus
+    @save :robot:
+    @direct :x:
+    @effects :white_check_mark:
+    @detectors DetectASRockSMBusControllers
+    @comment ASRock ASR RGB LED controllers will save with each update.
+        Per ARGB LED support is not possible with these devices.
+\*-------------------------------------------------------------------*/
+
+RGBController_ASRockASRRGBSMBus::RGBController_ASRockASRRGBSMBus(ASRockASRRGBSMBusController* controller_ptr)
+{
+    controller                  = controller_ptr;
+
+    name                        = controller->GetDeviceName();
+    vendor                      = "ASRock";
+    version                     = controller->GetFirmwareVersion();
+    type                        = DEVICE_TYPE_MOTHERBOARD;
+    description                 = "ASRock ASR RGB LED Device";
+    location                    = controller->GetDeviceLocation();
+
+    mode Off;
+    Off.name                    = "Off";
+    Off.value                   = ASRLED_MODE_OFF;
+    Off.flags                   = MODE_FLAG_AUTOMATIC_SAVE;
+    Off.color_mode              = MODE_COLORS_NONE;
+    modes.push_back(Off);
+
+    mode Static;
+    Static.name                 = "Static";
+    Static.value                = ASRLED_MODE_STATIC;
+    Static.flags                = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_AUTOMATIC_SAVE;
+    Static.color_mode           = MODE_COLORS_PER_LED;
+    modes.push_back(Static);
+
+    mode Breathing;
+    Breathing.name              = "Breathing";
+    Breathing.value             = ASRLED_MODE_BREATHING;
+    Breathing.flags             = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_AUTOMATIC_SAVE;
+    Breathing.speed_min         = ASRLED_SPEED_MIN;
+    Breathing.speed_max         = ASRLED_SPEED_MAX;
+    Breathing.speed             = ASRLED_SPEED_DEFAULT;
+    Breathing.color_mode        = MODE_COLORS_PER_LED;
+    modes.push_back(Breathing);
+
+    mode Strobe;
+    Strobe.name                 = "Strobe";
+    Strobe.value                = ASRLED_MODE_STROBE;
+    Strobe.flags                = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_AUTOMATIC_SAVE;
+    Strobe.speed_min            = ASRLED_SPEED_MIN;
+    Strobe.speed_max            = ASRLED_SPEED_MAX;
+    Strobe.speed                = ASRLED_SPEED_DEFAULT;
+    Strobe.color_mode           = MODE_COLORS_PER_LED;
+    modes.push_back(Strobe);
+
+    mode SpectrumCycle;
+    SpectrumCycle.name          = "Spectrum Cycle";
+    SpectrumCycle.value         = ASRLED_MODE_SPECTRUM_CYCLE;
+    SpectrumCycle.flags         = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    SpectrumCycle.speed_min     = ASRLED_SPEED_MIN;
+    SpectrumCycle.speed_max     = ASRLED_SPEED_MAX;
+    SpectrumCycle.speed         = ASRLED_SPEED_DEFAULT;
+    SpectrumCycle.color_mode    = MODE_COLORS_NONE;
+    modes.push_back(SpectrumCycle);
+
+    mode Random;
+    Random.name                 = "Random";
+    Random.value                = ASRLED_MODE_RANDOM;
+    Random.flags                = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Random.speed_min            = ASRLED_SPEED_MIN;
+    Random.speed_max            = ASRLED_SPEED_MAX;
+    Random.speed                = ASRLED_SPEED_DEFAULT;
+    Random.color_mode           = MODE_COLORS_NONE;
+    modes.push_back(Random);
+
+    mode Music;
+    Music.name                  = "Music";
+    Music.value                 = ASRLED_MODE_MUSIC;
+    Music.flags                 = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_AUTOMATIC_SAVE;
+    Music.color_mode            = MODE_COLORS_PER_LED;
+    modes.push_back(Music);
+
+    mode Wave;
+    Wave.name                   = "Wave";
+    Wave.value                  = ASRLED_MODE_WAVE;
+    Wave.flags                  = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Wave.speed_min              = ASRLED_SPEED_MIN;
+    Wave.speed_max              = ASRLED_SPEED_MAX;
+    Wave.speed                  = ASRLED_SPEED_DEFAULT;
+    Wave.color_mode             = MODE_COLORS_NONE;
+    modes.push_back(Wave);
+
+    SetupZones();
+}
+
+RGBController_ASRockASRRGBSMBus::~RGBController_ASRockASRRGBSMBus()
+{
+    delete controller;
+}
+
+void RGBController_ASRockASRRGBSMBus::SetupZones()
+{
+    /*---------------------------------------------------------*\
+    | ASR LED motherboards only have a single zone/LED          |
+    \*---------------------------------------------------------*/
+
+    /*---------------------------------------------------------*\
+    | Set up zones                                              |
+    \*---------------------------------------------------------*/
+    zone* new_zone = new zone();
+
+    /*---------------------------------------------------------*\
+    | Set single zone name to "Motherboard"                     |
+    \*---------------------------------------------------------*/
+    new_zone->name          = "Motherboard";
+    new_zone->type          = ZONE_TYPE_SINGLE;
+    new_zone->leds_min      = 1;
+    new_zone->leds_max      = 1;
+    new_zone->leds_count    = 1;
+    new_zone->matrix_map    = NULL;
+
+    /*---------------------------------------------------------*\
+    | Push new zone to zones vector                             |
+    \*---------------------------------------------------------*/
+    zones.push_back(*new_zone);
+
+    /*---------------------------------------------------------*\
+    | Set up LEDs                                               |
+    \*---------------------------------------------------------*/
+    led* new_led = new led();
+
+    /*---------------------------------------------------------*\
+    | Set single LED name to "Motherboard"                      |
+    \*---------------------------------------------------------*/
+    new_led->name           = "Motherboard";
+
+    /*---------------------------------------------------------*\
+    | Push new LED to LEDs vector                               |
+    \*---------------------------------------------------------*/
+    leds.push_back(*new_led);
+
+    SetupColors();
+}
+
+void RGBController_ASRockASRRGBSMBus::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_ASRockASRRGBSMBus::DeviceUpdateLEDs()
+{
+    for (std::size_t led = 0; led < colors.size(); led++)
+    {
+        UpdateSingleLED(led);
+    }
+}
+
+void RGBController_ASRockASRRGBSMBus::UpdateZoneLEDs(int /*zone*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_ASRockASRRGBSMBus::UpdateSingleLED(int led)
+{
+    unsigned char red = RGBGetRValue(colors[led]);
+    unsigned char grn = RGBGetGValue(colors[led]);
+    unsigned char blu = RGBGetBValue(colors[led]);
+
+    /*---------------------------------------------------------*\
+    | If the LED value is non-zero, this LED overrides the LED  |
+    | index                                                     |
+    \*---------------------------------------------------------*/
+    if(leds[led].value != 0)
+    {
+        led = leds[led].value;
+    }
+
+    controller->SetColorsAndSpeed(led, red, grn, blu);
+}
+
+void RGBController_ASRockASRRGBSMBus::DeviceUpdateMode()
+{
+
+    controller->SetMode(0, modes[active_mode].value, modes[active_mode].speed);
+
+    DeviceUpdateLEDs();
+}

Controllers/ASRockSMBusController/RGBController_ASRockASRRGBSMBus.h

@@ -10,13 +10,13 @@
 #pragma once
 
 #include "RGBController.h"
-#include "ASRockPolychromeSMBusController.h"
+#include "ASRockASRRGBSMBusController.h"
 
-class RGBController_Polychrome : public RGBController
+class RGBController_ASRockASRRGBSMBus : public RGBController
 {
 public:
-    RGBController_Polychrome(PolychromeController* controller_ptr);
-    ~RGBController_Polychrome();
+    RGBController_ASRockASRRGBSMBus(ASRockASRRGBSMBusController* controller_ptr);
+    ~RGBController_ASRockASRRGBSMBus();
 
     void        SetupZones();
 
@@ -26,9 +26,8 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
-    PolychromeController* controller;
+    ASRockASRRGBSMBusController* controller;
 };

Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV1SMBus.cpp

@@ -0,0 +1,348 @@
+/*-----------------------------------------*\
+|  RGBController_ASRockPolychromeSMBus.cpp  |
+|                                           |
+|  Generic RGB Interface for OpenRGB        |
+|  ASRock ASR LED and Polychrome RGB Driver |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/15/2019  |
+\*-----------------------------------------*/
+
+#include "LogManager.h"
+#include "RGBController_ASRockPolychromeV1SMBus.h"
+
+static const char* polychrome_v1_zone_names[] =
+{
+    "RGB LED 1 Header",
+    "RGB LED 2 Header",
+    "PCH",
+    "IO Cover",
+    "Audio",
+    "Addressable Header"
+};
+
+/**------------------------------------------------------------------*\
+    @name ASRock Polychrome v1 SMBus
+    @category Motherboard
+    @type SMBus
+    @save :robot:
+    @direct :x:
+    @effects :white_check_mark:
+    @detectors DetectASRockSMBusControllers
+    @comment ASRock Polychrome v1 controllers will save with each update.
+        Per ARGB LED support is not possible with these devices.
+        ARGB size  and color order is set using the `ARGB Header Config mode`
+        `Right` = GRB mode that is needed for WS2812B ARGB devices and `Left` = RGB used for WS2811 strips
+        The modes speed slider will set the size of the header
+        Spectrum Cycles uses the RGB values to set the individual color brightness.
+\*-------------------------------------------------------------------*/
+
+RGBController_ASRockPolychromeV1SMBus::RGBController_ASRockPolychromeV1SMBus(ASRockPolychromeV1SMBusController* controller_ptr)
+{
+    controller                  = controller_ptr;
+
+    name                        = controller->GetDeviceName();
+    vendor                      = "ASRock";
+    version                     = controller->GetFirmwareVersion();
+    type                        = DEVICE_TYPE_MOTHERBOARD;
+    description                 = "ASRock Polychrome v1 Device";
+    location                    = controller->GetDeviceLocation();
+
+
+    mode Off;
+    Off.name                    = "Off";
+    Off.value                   = POLYCHROME_V1_MODE_OFF;
+    Off.flags                   = MODE_FLAG_AUTOMATIC_SAVE;
+    Off.color_mode              = MODE_COLORS_NONE;
+    modes.push_back(Off);
+
+    mode Static;
+    Static.name                 = "Static";
+    Static.value                = POLYCHROME_V1_MODE_STATIC;
+    Static.flags                = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_AUTOMATIC_SAVE;
+    Static.color_mode           = MODE_COLORS_PER_LED;
+    modes.push_back(Static);
+
+    mode Breathing;
+    Breathing.name              = "Breathing";
+    Breathing.value             = POLYCHROME_V1_MODE_BREATHING;
+    Breathing.flags             = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_AUTOMATIC_SAVE;
+    Breathing.speed_min         = POLYCHROME_V1_SPEED_MIN_BREATHING;
+    Breathing.speed_max         = POLYCHROME_V1_SPEED_MAX_BREATHING;
+    Breathing.speed             = POLYCHROME_V1_SPEED_DEFAULT_BREATHING;
+    Breathing.color_mode        = MODE_COLORS_PER_LED;
+    modes.push_back(Breathing);
+
+    mode Strobe;
+    Strobe.name                 = "Strobe";
+    Strobe.value                = POLYCHROME_V1_MODE_STROBE;
+    Strobe.flags                = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_AUTOMATIC_SAVE;
+    Strobe.speed_min            = POLYCHROME_V1_SPEED_MIN_STROBE;
+    Strobe.speed_max            = POLYCHROME_V1_SPEED_MAX_STROBE;
+    Strobe.speed                = POLYCHROME_V1_SPEED_DEFAULT_STROBE;
+    Strobe.color_mode           = MODE_COLORS_PER_LED;
+    modes.push_back(Strobe);
+
+    mode SpectrumCycle;
+    SpectrumCycle.name          = "Spectrum Cycle";
+    SpectrumCycle.value         = POLYCHROME_V1_MODE_SPECTRUM_CYCLE;
+    SpectrumCycle.flags         = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    SpectrumCycle.speed_min     = POLYCHROME_V1_SPEED_MIN_CYCLE;
+    SpectrumCycle.speed_max     = POLYCHROME_V1_SPEED_MAX_CYCLE;
+    SpectrumCycle.speed         = POLYCHROME_V1_SPEED_DEFAULT_CYCLE;
+    SpectrumCycle.color_mode    = MODE_COLORS_PER_LED;
+    modes.push_back(SpectrumCycle);
+
+    mode Random;
+    Random.name                 = "Random";
+    Random.value                = POLYCHROME_V1_MODE_RANDOM;
+    Random.flags                = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Random.speed_min            = POLYCHROME_V1_SPEED_MIN_RANDOM;
+    Random.speed_max            = POLYCHROME_V1_SPEED_MAX_RANDOM;
+    Random.speed                = POLYCHROME_V1_SPEED_DEFAULT_RANDOM;
+    Random.color_mode           = MODE_COLORS_NONE;
+    modes.push_back(Random);
+
+    mode Music;
+    Music.name                  = "Music";
+    Music.value                 = POLYCHROME_V1_MODE_MUSIC;
+    Music.flags                 = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_AUTOMATIC_SAVE;
+    Music.color_mode            = MODE_COLORS_NONE;
+    modes.push_back(Music);
+
+    mode Wave;
+    Wave.name                   = "Wave";
+    Wave.value                  = POLYCHROME_V1_MODE_WAVE;
+    Wave.flags                  = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Wave.speed_min              = POLYCHROME_V1_SPEED_MIN_WAVE;
+    Wave.speed_max              = POLYCHROME_V1_SPEED_MAX_WAVE;
+    Wave.speed                  = POLYCHROME_V1_SPEED_DEFAULT_WAVE;
+    Wave.color_mode             = MODE_COLORS_NONE;
+    modes.push_back(Wave);
+
+    /*---------------------------------------------------------------------*\
+    | Comment out until per zone modes are working. These are only for ARGB |
+    \*---------------------------------------------------------------------*/
+    /*
+    mode Spring;
+    Spring.name                 = "Spring";
+    Spring.value                = POLYCHROME_V1_MODE_SPRING;
+    Spring.flags                = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Spring.speed_min            = POLYCHROME_V1_SPEED_MIN_ARGB;
+    Spring.speed_max            = POLYCHROME_V1_SPEED_MAX_ARGB;
+    Spring.speed                = POLYCHROME_V1_SPEED_DEFAULT_SPRING;
+    Spring.color_mode           = MODE_COLORS_PER_LED;
+    modes.push_back(Spring);
+
+    mode Stack;
+    Stack.name                  = "Stack";
+    Stack.value                 = POLYCHROME_V1_MODE_STACK;
+    Stack.flags                 = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Stack.speed_min             = POLYCHROME_V1_SPEED_MIN_ARGB;
+    Stack.speed_max             = POLYCHROME_V1_SPEED_MAX_ARGB;
+    Stack.speed                 = POLYCHROME_V1_SPEED_DEFAULT_STACK;
+    Stack.color_mode            = MODE_COLORS_PER_LED;
+    modes.push_back(Stack);
+
+    mode Cram;
+    Cram.name                   = "Cram";
+    Cram.value                  = POLYCHROME_V1_MODE_CRAM;
+    Cram.flags                  = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Cram.speed_min              = POLYCHROME_V1_SPEED_MIN_ARGB;
+    Cram.speed_max              = POLYCHROME_V1_SPEED_MAX_ARGB;
+    Cram.speed                  = POLYCHROME_V1_SPEED_DEFAULT_CRAM;
+    Cram.color_mode             = MODE_COLORS_PER_LED;
+    modes.push_back(Cram);
+
+    mode Scan;
+    Scan.name                   = "Scan";
+    Scan.value                  = POLYCHROME_V1_MODE_SCAN;
+    Scan.flags                  = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Scan.speed_min              = POLYCHROME_V1_SPEED_MIN_ARGB;
+    Scan.speed_max              = POLYCHROME_V1_SPEED_MAX_ARGB;
+    Scan.speed                  = POLYCHROME_V1_SPEED_DEFAULT_SCAN;
+    Scan.color_mode             = MODE_COLORS_PER_LED;
+    modes.push_back(Scan);
+
+    mode Neon;
+    Neon.name                   = "Neon";
+    Neon.value                  = POLYCHROME_V1_MODE_NEON;
+    Neon.flags                  = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Neon.speed_min              = POLYCHROME_V1_SPEED_MIN_ARGB;
+    Neon.speed_max              = POLYCHROME_V1_SPEED_MAX_ARGB;
+    Neon.speed                  = POLYCHROME_V1_SPEED_DEFAULT_NEON;
+    Neon.color_mode             = MODE_COLORS_PER_LED;
+    modes.push_back(Neon);
+
+    mode Water;
+    Water.name                  = "Water";
+    Water.value                 = POLYCHROME_V1_MODE_WATER;
+    Water.flags                 = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Water.speed_min             = POLYCHROME_V1_SPEED_MIN_ARGB;
+    Water.speed_max             = POLYCHROME_V1_SPEED_MAX_ARGB;
+    Water.speed                 = POLYCHROME_V1_SPEED_DEFAULT_WATER;
+    Water.color_mode            = MODE_COLORS_PER_LED;
+    modes.push_back(Water);
+
+    mode Rainbow;
+    Rainbow.name                = "Rainbow";
+    Rainbow.value               = POLYCHROME_V1_MODE_RAINBOW;
+    Rainbow.flags               = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Rainbow.speed_min           = POLYCHROME_V1_SPEED_MIN_RAINBOW;
+    Rainbow.speed_max           = POLYCHROME_V1_SPEED_MAX_RAINBOW;
+    Rainbow.speed               = POLYCHROME_V1_SPEED_DEFAULT_RAINBOW;
+    Rainbow.color_mode          = MODE_COLORS_NONE;
+    modes.push_back(Rainbow);
+    */
+
+    /*---------------------------------------------------------------------*\
+    | This ARGB_Config section is a hack to allow users to configure the    |
+    | RGB vs GRB mode using the direction of the mode as well as set the    |
+    | size of the devices connected to the header using the brightness      |
+    | value.                                                                |
+    |                                                                       |
+    | The mode should be removed onece the device settings are avaiable.    |
+    \*---------------------------------------------------------------------*/
+    mode ARGB_Config;
+    ARGB_Config.name            = "ARGB Header Config";
+    ARGB_Config.value           = POLYCHROME_V1_REG_ARGB_GRB;
+    ARGB_Config.flags           = MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_SPEED  | MODE_FLAG_AUTOMATIC_SAVE;
+    ARGB_Config.speed           = controller->zone_led_count[POLYCHROME_V1_ZONE_ADDRESSABLE];
+    ARGB_Config.speed_min       = 1;
+    ARGB_Config.speed_max       = POLYCHROME_V1_ZONE_ADDRESSABLE_MAX;
+    ARGB_Config.direction       = controller -> GetARGBColorOrder();
+    ARGB_Config.color_mode      = MODE_COLORS_NONE;
+    modes.push_back(ARGB_Config);
+
+    SetupZones();
+
+    controller->LoadZoneConfig();
+    active_mode = getModeIndex(controller->zone_config[0].mode); // Hard coding zone 0 until per zone modes are available.
+
+    if(active_mode != POLYCHROME_V1_MODE_OFF)
+    {
+        for( uint8_t zone_idx = 0; zone_idx < zoneIndexMap.size(); zone_idx++)
+        {
+            zones[zone_idx].colors[0] = controller->GetZoneColor(zoneIndexMap[zone_idx]);
+        }
+    }
+}
+
+RGBController_ASRockPolychromeV1SMBus::~RGBController_ASRockPolychromeV1SMBus()
+{
+    delete controller;
+}
+
+uint8_t RGBController_ASRockPolychromeV1SMBus::getModeIndex(uint8_t mode_value)
+{
+    for(uint8_t mode_index = 0; mode_index < modes.size(); mode_index++)
+    {
+        if (modes[mode_index].value == mode_value)
+        {
+            return mode_index;
+        }
+    }
+    return 0;
+}
+
+void RGBController_ASRockPolychromeV1SMBus::SetupZones()
+{
+    /*---------------------------------------------------------*\
+    | Polychrome motherboards should set up zones based on LED  |
+    | configuration register read from device                   |
+    \*---------------------------------------------------------*/
+    /*---------------------------------------------------------*\
+    | Set up zones                                              |
+    \*---------------------------------------------------------*/
+    for(uint8_t zone_idx = 0; zone_idx < POLYCHROME_V1_ZONE_COUNT; zone_idx++)
+    {
+        if(controller->zone_led_count[zone_idx] > 0)
+        {
+            zone*   new_zone        = new zone();
+            /*---------------------------------------------------------*\
+            | Set zone name to channel name                             |
+            \*---------------------------------------------------------*/
+            new_zone->name          = polychrome_v1_zone_names[zone_idx];
+            new_zone->type          = ZONE_TYPE_SINGLE;
+            new_zone->leds_min      = 1;
+            new_zone->leds_max      = 1;
+            new_zone->leds_count    = 1;
+            new_zone->matrix_map    = NULL;
+
+            if(zone_idx == POLYCHROME_V1_ZONE_ADDRESSABLE)
+            {
+                new_zone->leds_max  = POLYCHROME_V1_ZONE_ADDRESSABLE_MAX;
+            }
+            /*---------------------------------------------------------*\
+            | Push new zone to zones vector                             |
+            \*---------------------------------------------------------*/
+            zones.push_back(*new_zone);
+
+            /*---------------------------------------------------------*\
+            | Each zone only has one LED                                |
+            \*---------------------------------------------------------*/
+            led*    new_led         = new led();
+
+            new_led->name           = polychrome_v1_zone_names[zone_idx];
+            new_led->value          = zone_idx;
+
+            /*---------------------------------------------------------*\
+            | Push new LED to LEDs vector                               |
+            \*---------------------------------------------------------*/
+            leds.push_back(*new_led);
+            zoneIndexMap.push_back(zone_idx);
+        }
+    }
+
+    SetupColors();
+}
+
+void RGBController_ASRockPolychromeV1SMBus::ResizeZone(int zone, int new_size)
+{
+    LOG_TRACE("[%s] ResizeZone(%02X, %02X)", name.c_str(), zone, new_size);
+    controller-> SetARGBSize(new_size & 0xFF);
+    zones[POLYCHROME_V1_ZONE_ADDRESSABLE].leds_count = 1;
+}
+
+void RGBController_ASRockPolychromeV1SMBus::DeviceUpdateLEDs()
+{
+    LOG_TRACE("[%s] DeviceUpdateLEDs()", name.c_str());
+    for (uint8_t zone_idx = 0; zone_idx < zoneIndexMap.size(); zone_idx++)
+    {
+        UpdateSingleLED(zone_idx);
+    }
+}
+
+void RGBController_ASRockPolychromeV1SMBus::UpdateZoneLEDs(int /*zone*/)
+{
+    LOG_TRACE("[%s] UpdateZoneLEDs()", name.c_str());
+    DeviceUpdateLEDs();
+}
+
+void RGBController_ASRockPolychromeV1SMBus::UpdateSingleLED(int zone)
+{
+    LOG_TRACE("[%s] UpdateSingleLED(%02X)", name.c_str(), zone);
+
+    uint8_t red = RGBGetRValue(colors[zone]);
+    uint8_t grn = RGBGetGValue(colors[zone]);
+    uint8_t blu = RGBGetBValue(colors[zone]);
+
+    controller->SetColorsAndSpeed(zoneIndexMap[zone], red, grn, blu);
+}
+
+void RGBController_ASRockPolychromeV1SMBus::DeviceUpdateMode()
+{
+    LOG_TRACE("[%s] DeviceUpdateMode()", name.c_str());
+    if(modes[active_mode].value != POLYCHROME_V1_REG_ARGB_GRB)
+    {
+        for(uint8_t zone_idx = 0; zone_idx < zoneIndexMap.size(); zone_idx++)
+        {
+            controller->SetMode(zoneIndexMap[zone_idx], modes[active_mode].value, modes[active_mode].speed);
+            UpdateSingleLED(zone_idx);
+        }
+    }
+    else
+    {
+        controller-> SetARGBColorOrder(modes[active_mode].direction);
+        controller-> SetARGBSize(modes[active_mode].speed);
+    }
+}

Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV1SMBus.h

@@ -0,0 +1,35 @@
+/*-----------------------------------------*\
+|  RGBController_ASRockPolychromeV1SMBus.h  |
+|                                           |
+|  Generic RGB Interface for OpenRGB        |
+|  ASRock ASR LED and Polychrome RGB Driver |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/15/2019  |
+\*-----------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "ASRockPolychromeV1SMBusController.h"
+
+class RGBController_ASRockPolychromeV1SMBus : public RGBController
+{
+public:
+    RGBController_ASRockPolychromeV1SMBus(ASRockPolychromeV1SMBusController* controller_ptr);
+    ~RGBController_ASRockPolychromeV1SMBus();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+private:
+    ASRockPolychromeV1SMBusController* controller;
+    uint8_t                 getModeIndex(uint8_t mode_value);
+    std::vector<uint8_t>    zoneIndexMap;
+};

Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV2SMBus.cpp

@@ -0,0 +1,325 @@
+/*-----------------------------------------*\
+|  RGBController_ASRockPolychromeV2SMBus.cpp|
+|                                           |
+|  Generic RGB Interface for OpenRGB        |
+|  ASRock ASR LED and Polychrome RGB Driver |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/15/2019  |
+\*-----------------------------------------*/
+
+#include "RGBController_ASRockPolychromeV2SMBus.h"
+
+static const char* polychrome_v2_zone_names[] =
+{
+    "RGB LED 1 Header",
+    "RGB LED 2 Header",
+    "Audio",
+    "PCH",
+    "IO Cover",
+    "Addressable Header"
+};
+
+/**------------------------------------------------------------------*\
+    @name ASRock Polychrome v2 SMBus
+    @category Motherboard
+    @type SMBus
+    @save :robot:
+    @direct :x:
+    @effects :white_check_mark:
+    @detectors DetectASRockSMBusControllers
+    @comment ASRock Polychrome v2 controllers will save with each update.
+        Per ARGB LED support is not possible with these devices.
+\*-------------------------------------------------------------------*/
+
+RGBController_ASRockPolychromeV2SMBus::RGBController_ASRockPolychromeV2SMBus(ASRockPolychromeV2SMBusController* controller_ptr)
+{
+    controller                  = controller_ptr;
+
+    name                        = controller->GetDeviceName();
+    vendor                      = "ASRock";
+    version                     = controller->GetFirmwareVersion();
+    type                        = DEVICE_TYPE_MOTHERBOARD;
+    description                 = "ASRock Polychrome v2 Device";
+    location                    = controller->GetDeviceLocation();
+
+
+    mode Off;
+    Off.name                    = "Off";
+    Off.value                   = POLYCHROME_V2_MODE_OFF;
+    Off.flags                   = MODE_FLAG_AUTOMATIC_SAVE;
+    Off.color_mode              = MODE_COLORS_NONE;
+    modes.push_back(Off);
+
+    mode Static;
+    Static.name                 = "Static";
+    Static.value                = POLYCHROME_V2_MODE_STATIC;
+    Static.flags                = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_AUTOMATIC_SAVE;
+    Static.color_mode           = MODE_COLORS_PER_LED;
+    modes.push_back(Static);
+
+    mode Breathing;
+    Breathing.name              = "Breathing";
+    Breathing.value             = POLYCHROME_V2_MODE_BREATHING;
+    Breathing.flags             = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_AUTOMATIC_SAVE;
+    Breathing.speed_min         = POLYCHROME_V2_BREATHING_SPEED_MIN;
+    Breathing.speed_max         = POLYCHROME_V2_BREATHING_SPEED_MAX;
+    Breathing.speed             = POLYCHROME_V2_BREATHING_SPEED_DEFAULT;
+    Breathing.color_mode        = MODE_COLORS_PER_LED;
+    modes.push_back(Breathing);
+
+    mode Strobe;
+    Strobe.name                 = "Strobe";
+    Strobe.value                = POLYCHROME_V2_MODE_STROBE;
+    Strobe.flags                = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_AUTOMATIC_SAVE;
+    Strobe.speed_min            = POLYCHROME_V2_STROBE_SPEED_MIN;
+    Strobe.speed_max            = POLYCHROME_V2_STROBE_SPEED_MAX;
+    Strobe.speed                = POLYCHROME_V2_STROBE_SPEED_DEFAULT;
+    Strobe.color_mode           = MODE_COLORS_PER_LED;
+    modes.push_back(Strobe);
+
+    mode SpectrumCycle;
+    SpectrumCycle.name          = "Spectrum Cycle";
+    SpectrumCycle.value         = POLYCHROME_V2_MODE_SPECTRUM_CYCLE;
+    SpectrumCycle.flags         = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    SpectrumCycle.speed_min     = POLYCHROME_V2_SPECTRUM_CYCLE_SPEED_MIN;
+    SpectrumCycle.speed_max     = POLYCHROME_V2_SPECTRUM_CYCLE_SPEED_MAX;
+    SpectrumCycle.speed         = POLYCHROME_V2_SPECTRUM_CYCLE_SPEED_DEFAULT;
+    SpectrumCycle.color_mode    = MODE_COLORS_NONE;
+    modes.push_back(SpectrumCycle);
+
+    mode Random;
+    Random.name                 = "Random";
+    Random.value                = POLYCHROME_V2_MODE_RANDOM;
+    Random.flags                = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Random.speed_min            = POLYCHROME_V2_RANDOM_SPEED_MIN;
+    Random.speed_max            = POLYCHROME_V2_RANDOM_SPEED_MAX;
+    Random.speed                = POLYCHROME_V2_RANDOM_SPEED_DEFAULT;
+    Random.color_mode           = MODE_COLORS_NONE;
+    modes.push_back(Random);
+
+    mode Wave;
+    Wave.name                   = "Wave";
+    Wave.value                  = POLYCHROME_V2_MODE_WAVE;
+    Wave.flags                  = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Wave.speed_min              = POLYCHROME_V2_WAVE_SPEED_MIN;
+    Wave.speed_max              = POLYCHROME_V2_WAVE_SPEED_MAX;
+    Wave.speed                  = POLYCHROME_V2_WAVE_SPEED_DEFAULT;
+    Wave.color_mode             = MODE_COLORS_NONE;
+    modes.push_back(Wave);
+
+    mode Spring;
+    Spring.name                 = "Spring";
+    Spring.value                = POLYCHROME_V2_MODE_SPRING;
+    Spring.flags                = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Spring.speed_min            = POLYCHROME_V2_SPRING_SPEED_MIN;
+    Spring.speed_max            = POLYCHROME_V2_SPRING_SPEED_MAX;
+    Spring.speed                = POLYCHROME_V2_SPRING_SPEED_DEFAULT;
+    Spring.color_mode           = MODE_COLORS_NONE;
+    modes.push_back(Spring);
+
+    mode Stack;
+    Stack.name                  = "Stack";
+    Stack.value                 = POLYCHROME_V2_MODE_STACK;
+    Stack.flags                 = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Stack.speed_min             = POLYCHROME_V2_STACK_SPEED_MIN;
+    Stack.speed_max             = POLYCHROME_V2_STACK_SPEED_MAX;
+    Stack.speed                 = POLYCHROME_V2_STACK_SPEED_DEFAULT;
+    Stack.color_mode            = MODE_COLORS_NONE;
+    modes.push_back(Stack);
+
+    mode Cram;
+    Cram.name                   = "Cram";
+    Cram.value                  = POLYCHROME_V2_MODE_CRAM;
+    Cram.flags                  = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Cram.speed_min              = POLYCHROME_V2_CRAM_SPEED_MIN;
+    Cram.speed_max              = POLYCHROME_V2_CRAM_SPEED_MAX;
+    Cram.speed                  = POLYCHROME_V2_CRAM_SPEED_DEFAULT;
+    Cram.color_mode             = MODE_COLORS_NONE;
+    modes.push_back(Cram);
+
+    mode Scan;
+    Scan.name                   = "Scan";
+    Scan.value                  = POLYCHROME_V2_MODE_SCAN;
+    Scan.flags                  = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Scan.speed_min              = POLYCHROME_V2_SCAN_SPEED_MIN;
+    Scan.speed_max              = POLYCHROME_V2_SCAN_SPEED_MAX;
+    Scan.speed                  = POLYCHROME_V2_SCAN_SPEED_DEFAULT;
+    Scan.color_mode             = MODE_COLORS_NONE;
+    modes.push_back(Scan);
+
+    mode Neon;
+    Neon.name                   = "Neon";
+    Neon.value                  = POLYCHROME_V2_MODE_NEON;
+    Neon.flags                  = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Neon.speed_min              = POLYCHROME_V2_NEON_SPEED_MIN;
+    Neon.speed_max              = POLYCHROME_V2_NEON_SPEED_MAX;
+    Neon.speed                  = POLYCHROME_V2_NEON_SPEED_DEFAULT;
+    Neon.color_mode             = MODE_COLORS_NONE;
+    modes.push_back(Neon);
+
+    mode Water;
+    Water.name                  = "Water";
+    Water.value                 = POLYCHROME_V2_MODE_WATER;
+    Water.flags                 = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Water.speed_min             = POLYCHROME_V2_WATER_SPEED_MIN;
+    Water.speed_max             = POLYCHROME_V2_WATER_SPEED_MAX;
+    Water.speed                 = POLYCHROME_V2_WATER_SPEED_DEFAULT;
+    Water.color_mode            = MODE_COLORS_NONE;
+    modes.push_back(Water);
+
+    mode Rainbow;
+    Rainbow.name                = "Rainbow";
+    Rainbow.value               = POLYCHROME_V2_MODE_RAINBOW;
+    Rainbow.flags               = MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
+    Rainbow.speed_min           = POLYCHROME_V2_RAINBOW_SPEED_MIN;
+    Rainbow.speed_max           = POLYCHROME_V2_RAINBOW_SPEED_MAX;
+    Rainbow.speed               = POLYCHROME_V2_RAINBOW_SPEED_DEFAULT;
+    Rainbow.color_mode          = MODE_COLORS_NONE;
+    modes.push_back(Rainbow);
+
+    SetupZones();
+}
+
+RGBController_ASRockPolychromeV2SMBus::~RGBController_ASRockPolychromeV2SMBus()
+{
+    delete controller;
+}
+
+void RGBController_ASRockPolychromeV2SMBus::SetupZones()
+{
+
+    /*---------------------------------------------------------*\
+    | Set up zones                                              |
+    \*---------------------------------------------------------*/
+    for(unsigned int zone_idx = 0; zone_idx < POLYCHROME_V2_ZONE_COUNT; zone_idx++)
+    {
+        if(controller->zone_led_count[zone_idx] > 0)
+        {
+            zone* new_zone = new zone();
+
+            /*---------------------------------------------------------*\
+            | Set zone name to channel name                             |
+            \*---------------------------------------------------------*/
+
+            new_zone->name          = polychrome_v2_zone_names[zone_idx];
+
+
+            if(zone_idx == POLYCHROME_V2_ZONE_ADDRESSABLE)
+            {
+                new_zone->leds_min      = 1;
+                new_zone->leds_max      = 1;
+                new_zone->leds_count    = 1;
+            }
+            else
+            {
+                new_zone->leds_min      = controller->zone_led_count[zone_idx];
+                new_zone->leds_max      = controller->zone_led_count[zone_idx];
+                new_zone->leds_count    = controller->zone_led_count[zone_idx];
+            }
+
+            if(new_zone->leds_count > 1)
+            {
+                new_zone->type          = ZONE_TYPE_LINEAR;
+            }
+            else
+            {
+                new_zone->type          = ZONE_TYPE_SINGLE;
+            }
+
+            new_zone->matrix_map        = NULL;
+
+            /*---------------------------------------------------------*\
+            | Push new zone to zones vector                             |
+            \*---------------------------------------------------------*/
+            zones.push_back(*new_zone);
+        }
+    }
+
+    unsigned int led_count = 0;
+    /*---------------------------------------------------------*\
+    | Set up LEDs                                               |
+    \*---------------------------------------------------------*/
+    for(unsigned int zone_idx = 0; zone_idx < POLYCHROME_V2_ZONE_COUNT; zone_idx++)
+    {
+        if(controller->zone_led_count[zone_idx] > 0)
+        {
+            for(unsigned int led_idx = 0; led_idx < controller->zone_led_count[zone_idx]; led_idx++)
+            {
+                /*---------------------------------------------------------*\
+                | Each zone only has one LED                                |
+                \*---------------------------------------------------------*/
+                led* new_led = new led();
+
+                new_led->name           = polychrome_v2_zone_names[zone_idx];
+
+                new_led->name.append(" " + std::to_string(led_idx + 1));
+                new_led->value = 0;
+
+                if(zone_idx == POLYCHROME_V2_ZONE_ADDRESSABLE)
+                {
+                    new_led->value              = 0x19;
+                }
+
+                /*---------------------------------------------------------*\
+                | Push new LED to LEDs vector                               |
+                \*---------------------------------------------------------*/
+                leds.push_back(*new_led);
+
+                led_count++;
+
+                if(zone_idx == POLYCHROME_V2_ZONE_ADDRESSABLE)
+                {
+                    break;
+                }
+            }
+        }
+    }
+
+    SetupColors();
+}
+
+void RGBController_ASRockPolychromeV2SMBus::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_ASRockPolychromeV2SMBus::DeviceUpdateLEDs()
+{
+    for (std::size_t led = 0; led < colors.size(); led++)
+    {
+        UpdateSingleLED(led);
+    }
+}
+
+void RGBController_ASRockPolychromeV2SMBus::UpdateZoneLEDs(int /*zone*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_ASRockPolychromeV2SMBus::UpdateSingleLED(int led)
+{
+    unsigned char red = RGBGetRValue(colors[led]);
+    unsigned char grn = RGBGetGValue(colors[led]);
+    unsigned char blu = RGBGetBValue(colors[led]);
+
+    /*---------------------------------------------------------*\
+    | If the LED value is non-zero, this LED overrides the LED  |
+    | index                                                     |
+    \*---------------------------------------------------------*/
+    if(leds[led].value != 0)
+    {
+        led = leds[led].value;
+    }
+
+    controller->SetColorsAndSpeed(led, red, grn, blu);
+}
+
+void RGBController_ASRockPolychromeV2SMBus::DeviceUpdateMode()
+{
+
+    controller->SetMode(0, modes[active_mode].value, modes[active_mode].speed);
+
+    DeviceUpdateLEDs();
+}

Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV2SMBus.h

@@ -0,0 +1,33 @@
+/*-----------------------------------------*\
+|  RGBController_ASRockPolychromev2SMBus.h  |
+|                                           |
+|  Generic RGB Interface for OpenRGB        |
+|  ASRock ASR LED and Polychrome RGB Driver |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/15/2019  |
+\*-----------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "ASRockPolychromeV2SMBusController.h"
+
+class RGBController_ASRockPolychromeV2SMBus : public RGBController
+{
+public:
+    RGBController_ASRockPolychromeV2SMBus(ASRockPolychromeV2SMBusController* controller_ptr);
+    ~RGBController_ASRockPolychromeV2SMBus();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+private:
+    ASRockPolychromeV2SMBusController* controller;
+};

Controllers/AlienwareController/RGBController_Alienware.cpp

@@ -14,6 +14,7 @@
 
 /**------------------------------------------------------------------*\
     @name Alienware
+    @category Keyboard
     @type USB
     @save :x:
     @direct :x:
@@ -147,7 +148,7 @@ void RGBController_Alienware::SetupZones()
     for(unsigned int led_idx = 0; led_idx < zones.size(); led_idx++)
     {
         led new_led;
-        
+
         new_led.name        = zones[led_idx].name + std::string(" LED");
 
         leds.emplace_back(new_led);
@@ -178,11 +179,6 @@ void RGBController_Alienware::UpdateSingleLED(int led)
     UpdateZoneLEDs(led);
 }
 
-void RGBController_Alienware::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 static bool modes_eq(const mode& mode1, const mode& mode2)
 {
     return( ( mode1.name           == mode2.name       )
@@ -228,7 +224,7 @@ void RGBController_Alienware::DeviceUpdateMode()
             uint16_t period = 0x07d0;
 
             controller->SetMode(zone_idx, current_mode.value);
-            
+
             switch(current_mode_idx)
             {
                 case ALIENWARE_MODE_COLOR:

Controllers/AlienwareController/RGBController_Alienware.h

@@ -29,8 +29,6 @@ public:
 
     void        DeviceUpdateMode();
 
-    void        SetCustomMode();
-
 private:
     AlienwareController*                    controller;
     std::chrono::steady_clock::time_point   last_packet_ts;

Controllers/AlienwareKeyboardController/AlienwareAW510KController.cpp

@@ -172,7 +172,7 @@ void AlienwareAW510KController::SendInitialize()
 
 void AlienwareAW510KController::SetDirect
     (
-    unsigned char   zone,
+    unsigned char   /*zone*/,
     unsigned char   r,
     unsigned char   g,
     unsigned char   b
@@ -222,7 +222,7 @@ void AlienwareAW510KController::SendDirectOn
     | To Guarantee the data are always %4 =0 append   |
     | zeros at end of last packet                     |
     \*-----------------------------------------------*/
-    for(int i = 0; i < (frame_data.size() % 4); i++)
+    for(unsigned int i = 0; i < (frame_data.size() % 4); i++)
     {
         SelectedKeys key;
         key.idx     = 0x00;
@@ -358,7 +358,7 @@ void AlienwareAW510KController::UpdateSingleLED
 }
 void AlienwareAW510KController::SendMode
     (
-    unsigned char   zone,
+    unsigned char   /*zone*/,
     unsigned char   mode,
     unsigned short  speed,
     unsigned char   direction,

Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp

@@ -160,6 +160,7 @@ static const led_type led_names[] =
 
 /**------------------------------------------------------------------*\
     @name Alienware AW510 Keyboard
+    @category Keyboard
     @type USB
     @save :x:
     @direct :white_check_mark:
@@ -170,21 +171,21 @@ static const led_type led_names[] =
 
 RGBController_AlienwareAW510K::RGBController_AlienwareAW510K(AlienwareAW510KController* controller_ptr)
 {
-    controller  = controller_ptr;
+    controller                      = controller_ptr;
 
-    name        = "Alienware AW510K Keyboard Device";
-    vendor      = "Alienware";
-    type        = DEVICE_TYPE_KEYBOARD;
-    description = "Alienware AW510K Keyboard Device";
-    location    = controller->GetDeviceLocation();
-    serial      = controller->GetSerialString();
+    name                            = "Alienware AW510K Keyboard Device";
+    vendor                          = "Alienware";
+    type                            = DEVICE_TYPE_KEYBOARD;
+    description                     = "Alienware AW510K Keyboard Device";
+    location                        = controller->GetDeviceLocation();
+    serial                          = controller->GetSerialString();
 
-    mode Direct_Per_LED;
-    Direct_Per_LED.name             = "Direct";
-    Direct_Per_LED.value            = ALIENWARE_AW510K_MODE_DIRECT_PER_LED;
-    Direct_Per_LED.flags            = MODE_FLAG_HAS_PER_LED_COLOR;
-    Direct_Per_LED.color_mode       = MODE_COLORS_PER_LED;
-    modes.push_back(Direct_Per_LED);
+    mode Direct;
+    Direct.name                     = "Direct";
+    Direct.value                    = ALIENWARE_AW510K_MODE_DIRECT_PER_LED;
+    Direct.flags                    = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode               = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
 
     mode Static;
     Static.name                     = "Static";
@@ -402,11 +403,6 @@ void RGBController_AlienwareAW510K::UpdateSingleLED(int led)
     controller->UpdateSingleLED(leds[led].value, RGBGetRValue(colors[led]), RGBGetGValue(colors[led]), RGBGetBValue(colors[led]));
 }
 
-void RGBController_AlienwareAW510K::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_AlienwareAW510K::DeviceUpdateMode()
 {
     if(active_mode == 0xFFFF)

Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.h

@@ -26,7 +26,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:

Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp

@@ -18,12 +18,12 @@ static unsigned int matrix_map[5][14] =
     { { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 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, NA },
-      { 41, NA, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, NA }, 
+      { 41, NA, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, NA },
       { 53, NA, 54, 55, NA, NA, 56, NA, NA, 57, 58, 59, 60, NA } };
 
 static const char* zone_names[] =
 {
-    "Keyboard",
+    ZONE_EN_KEYBOARD,
 };
 
 static zone_type zone_types[] =
@@ -110,6 +110,7 @@ static const led_type led_names[] =
 
 /**------------------------------------------------------------------*\
     @name Anne Pro 2
+    @category Keyboard
     @type USB
     @save :x:
     @direct :white_check_mark:
@@ -118,7 +119,7 @@ static const led_type led_names[] =
     @comment
 \*-------------------------------------------------------------------*/
 
-RGBController_AnnePro2::RGBController_AnnePro2(AnnePro2Controller* controller_ptr) 
+RGBController_AnnePro2::RGBController_AnnePro2(AnnePro2Controller* controller_ptr)
 {
     controller  = controller_ptr;
 
@@ -139,12 +140,12 @@ RGBController_AnnePro2::RGBController_AnnePro2(AnnePro2Controller* controller_pt
     SetupZones();
 }
 
-RGBController_AnnePro2::~RGBController_AnnePro2() 
+RGBController_AnnePro2::~RGBController_AnnePro2()
 {
     delete controller;
 }
 
-void RGBController_AnnePro2::SetupZones() 
+void RGBController_AnnePro2::SetupZones()
 {
     /*---------------------------------------------------------*\
     | Set up zones                                              |
@@ -187,14 +188,14 @@ void RGBController_AnnePro2::SetupZones()
     SetupColors();
 }
 
-void RGBController_AnnePro2::ResizeZone(int /*zone*/, int /*new_size*/) 
+void RGBController_AnnePro2::ResizeZone(int /*zone*/, int /*new_size*/)
 {
     /*---------------------------------------------------------*\
     | This device does not support resizing zones               |
     \*---------------------------------------------------------*/
 }
 
-void RGBController_AnnePro2::DeviceUpdateLEDs() 
+void RGBController_AnnePro2::DeviceUpdateLEDs()
 {
     const unsigned char frame_buf_length = LED_REAL_COUNT * 3;
     unsigned char frame_buf[frame_buf_length];
@@ -225,22 +226,17 @@ void RGBController_AnnePro2::DeviceUpdateLEDs()
     controller->SendDirect(frame_buf_length, frame_buf);
 }
 
-void RGBController_AnnePro2::UpdateZoneLEDs(int /*zone*/) 
+void RGBController_AnnePro2::UpdateZoneLEDs(int /*zone*/)
 {
     DeviceUpdateLEDs();
 }
 
-void RGBController_AnnePro2::UpdateSingleLED(int /*led*/) 
+void RGBController_AnnePro2::UpdateSingleLED(int /*led*/)
 {
     DeviceUpdateLEDs();
 }
 
-void RGBController_AnnePro2::SetCustomMode() 
+void RGBController_AnnePro2::DeviceUpdateMode()
 {
-    active_mode = 0;
-}
 
-void RGBController_AnnePro2::DeviceUpdateMode() 
-{
-    
 }

Controllers/AnnePro2Controller/RGBController_AnnePro2.h

@@ -24,7 +24,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:

Controllers/AsusAuraCoreController/AsusAuraCoreControllerDetect.cpp

@@ -2,9 +2,12 @@
 #include "AsusAuraCoreController.h"
 #include "RGBController.h"
 #include "RGBController_AsusAuraCore.h"
+#include "RGBController_AsusAuraCoreLaptop.h"
 #include <hidapi/hidapi.h>
 
-#define AURA_CORE_VID 0x0B05
+#define AURA_CORE_VID                   0x0B05
+
+#define AURA_STRIX_SCAR_15_PID          0x19B6
 
 /******************************************************************************************\
 *                                                                                          *
@@ -14,13 +17,14 @@
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectAsusAuraCoreControllers(hid_device_info* info, const std::string&)
+void DetectAsusAuraCoreControllers(hid_device_info* info, const std::string& /*name*/)
 {
     hid_device* dev = hid_open_path(info->path);
-    if( dev )
+
+    if(dev)
     {
-        AuraCoreController*     controller     = new AuraCoreController(dev, info->path);
-        RGBController_AuraCore* rgb_controller = new RGBController_AuraCore(controller);
+        AuraCoreController*     controller                  = new AuraCoreController(dev, info->path);
+        RGBController_AuraCore* rgb_controller              = new RGBController_AuraCore(controller);
         // Constructor sets the name
         if(rgb_controller->type != DEVICE_TYPE_UNKNOWN)
         {
@@ -33,6 +37,21 @@ void DetectAsusAuraCoreControllers(hid_device_info* info, const std::string&)
     }
 }
 
-REGISTER_HID_DETECTOR("ASUS Aura Core", DetectAsusAuraCoreControllers, AURA_CORE_VID, 0x1854);
-REGISTER_HID_DETECTOR("ASUS Aura Core", DetectAsusAuraCoreControllers, AURA_CORE_VID, 0x1866);
-REGISTER_HID_DETECTOR("ASUS Aura Core", DetectAsusAuraCoreControllers, AURA_CORE_VID, 0x1869);
+void DetectAsusAuraCoreLaptopControllers(hid_device_info* info, const std::string& /*name*/)
+{
+    hid_device* dev = hid_open_path(info->path);
+
+    if(dev)
+    {
+        AsusAuraCoreLaptopController*     controller        = new AsusAuraCoreLaptopController(dev, info->path);
+        RGBController_AsusAuraCoreLaptop* rgb_controller    = new RGBController_AsusAuraCoreLaptop(controller);
+        // Constructor sets the name
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
+    }
+}
+
+
+REGISTER_HID_DETECTOR   ("ASUS Aura Core",              DetectAsusAuraCoreControllers,          AURA_CORE_VID, 0x1854);
+REGISTER_HID_DETECTOR   ("ASUS Aura Core",              DetectAsusAuraCoreControllers,          AURA_CORE_VID, 0x1866);
+REGISTER_HID_DETECTOR   ("ASUS Aura Core",              DetectAsusAuraCoreControllers,          AURA_CORE_VID, 0x1869);
+REGISTER_HID_DETECTOR_PU("ASUS ROG Strix SCAR 15",      DetectAsusAuraCoreLaptopControllers,    AURA_CORE_VID, AURA_STRIX_SCAR_15_PID,  0xFF31, 0x79);

Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController.cpp

@@ -0,0 +1,356 @@
+/*---------------------------------------------------------------------*\
+|  AsusAuraCoreLaptopController.cpp                                     |
+|                                                                       |
+|  Driver for Asus Aura Core Laptop USB Controller                      |
+|                                                                       |
+|  Chris M (Dr_No)          28 Jul 2022                                 |
+|                                                                       |
+\*---------------------------------------------------------------------*/
+
+#include "AsusAuraCoreLaptopController.h"
+
+static uint8_t packet_map[ASUSAURACORELAPTOP_KEYCOUNT       +
+                          ASUSAURACORELAPTOP_LIGHTBARCOUNT  +
+                          ASUSAURACORELAPTOP_LIDCOUNT       ] =
+{
+/*00        ESC  F1   F2   F3   F4   F5   F6   F7   F8   F9  */
+            21,  23,  24,  25,  26,  28,  29,  30,  31,  33,
+
+/*10        F10  F11  F12  DEL   `    1    2    3    4    5  */
+            34,  35,  36,  37,  42,  43,  44,  45,  46,  47,
+
+/*20         6    7    8    9    0    -    =   BSP  BSP  BSP */
+            48,  49,  50,  51,  52,  53,  54,  55,  56,  57,
+
+/*30        PLY  TAB   Q    W    E    R    T    Y    U    I  */
+            58,  63,  64,  65,  66,  67,  68,  69,  70,  71,
+
+/*40         O    P    [    ]    \   STP  CAP   A    S    D  */
+            72,  73,  74,  75,  76,  79,  84,  85,  86,  87,
+
+/*50         F    G    H    J    K    L    ;    '   ENT  PRV */
+            88,  89,  90,  91,  92,  93,  94,  95,  98, 100,
+
+/*60        LSH   Z    X    C    V    B    N    M    ,    .  */
+           105, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+
+/*70         /   RSH  UP   NXT LCTL  LFN LWIN LALT  SPC RALT */
+           116, 119, 139, 121, 126, 127, 128, 129, 131, 135,
+
+/*80       RCTL  LFT  DWN  RGT  PRT KSTN  VDN  VUP MICM HPFN */
+           137, 159, 160, 161, 142, 175,   2,   3,   4,   5,
+
+/*90       ARMC  LB1  LB2  LB3  LB4  LB5  LB6 LOGO LIDL LIDR */
+             6, 174, 173, 172, 171, 170, 169, 167, 176, 177,
+
+};
+
+static std::string power_zones[ASUSAURACORELAPTOP_POWER_ZONES] =
+{
+    "Logo",
+    ZONE_EN_KEYBOARD,
+    "Lightbar",
+    "Lid Edges"
+};
+
+static std::string power_states[ASUSAURACORELAPTOP_POWER_STATES] =
+{
+    " when booting",
+    " when awake",
+    " when sleeping",
+    " when off",
+};
+
+AsusAuraCoreLaptopController::AsusAuraCoreLaptopController(hid_device* dev_handle, const char* path)
+{
+    const uint8_t sz    = HID_MAX_STR;
+    wchar_t       tmp[sz];
+
+    dev                 = dev_handle;
+    location            = path;
+
+    hid_get_manufacturer_string(dev, tmp, sz);
+    std::wstring wName = std::wstring(tmp);
+    device_name = std::string(wName.begin(), wName.end());
+
+    hid_get_product_string(dev, tmp, sz);
+    wName = std::wstring(tmp);
+    device_name.append(" ").append(std::string(wName.begin(), wName.end()));
+
+    SetPowerConfigFromJSON();
+}
+
+AsusAuraCoreLaptopController::~AsusAuraCoreLaptopController()
+{
+    hid_close(dev);
+}
+
+std::string AsusAuraCoreLaptopController::GetDeviceName()
+{
+    return device_name;
+}
+
+std::string AsusAuraCoreLaptopController::GetSerial()
+{
+    const uint8_t sz    = HID_MAX_STR;
+    wchar_t       tmp[sz];
+
+    int ret             = hid_get_serial_number_string(dev, tmp, sz);
+
+    if (ret != 0)
+    {
+        LOG_DEBUG("[%s] Get HID Serial string failed", device_name.c_str());
+        return("");
+    }
+
+    std::wstring w_tmp  = std::wstring(tmp);
+    std::string serial  = std::string(w_tmp.begin(), w_tmp.end());
+
+    return serial;
+}
+
+std::string AsusAuraCoreLaptopController::GetLocation()
+{
+    return("HID: " + location);
+}
+
+void AsusAuraCoreLaptopController::SetMode(uint8_t mode, uint8_t speed, uint8_t brightness, RGBColor color1, RGBColor color2, uint8_t random, uint8_t direction)
+{
+    bool needs_update       = !( (current_mode          == mode         )   &&
+                                 (current_speed         == speed        )   &&
+                                 (current_brightness    == brightness   )   &&
+                                 (current_c1            == color1       )   &&
+                                 (current_c2            == color2       )   &&
+                                 (current_random        == random       )   &&
+                                 (current_direction     == direction    )   );
+
+    if(needs_update)
+    {
+        current_mode        = mode;
+        current_speed       = speed;
+        current_brightness  = brightness;
+        current_c1          = color1;
+        current_c2          = color2;
+        current_random      = random;
+        current_direction   = direction;
+
+        SendUpdate();
+        SendBrightness();
+    }
+}
+
+void AsusAuraCoreLaptopController::SetLedsDirect(std::vector<RGBColor> colors)
+{
+    /*---------------------------------------------------------*\
+    | The keyboard zone is a set of 168 keys (indexed from 0)   |
+    |   sent in 11 packets of 16 triplets. The Lid and Lightbar |
+    |   zones are sent in one final packet afterwards.          |
+    \*---------------------------------------------------------*/
+    const uint8_t  key_set                                  = 167;
+    const uint8_t  led_count                                = 178;
+    const uint16_t map_size                                 = 3 * led_count;
+    const uint8_t leds_per_packet                           = 16;
+    uint8_t buffer[ASUSAURACORELAPTOP_WRITE_PACKET_SIZE]    = { ASUSAURACORELAPTOP_REPORT_ID, ASUSAURACORELAPTOP_CMD_DIRECT,
+                                                                0x00, 0x01, 0x01, 0x01, 0x00, leds_per_packet, 0x00 };
+    uint8_t key_buf[map_size];
+
+    memset(key_buf, 0, map_size);
+
+    for(size_t led_index = 0; led_index < colors.size(); led_index++)
+    {
+        uint16_t offset         = 3 * packet_map[led_index];
+
+        key_buf[offset]         = RGBGetRValue(colors[led_index]);
+        key_buf[offset + 1]     = RGBGetGValue(colors[led_index]);
+        key_buf[offset + 2]     = RGBGetBValue(colors[led_index]);
+    }
+
+    for(size_t i = 0; i < key_set; i+=leds_per_packet)
+    {
+        uint8_t leds_remaining  = key_set - i;
+
+        if(leds_remaining < leds_per_packet)
+        {
+            buffer[07]          = leds_remaining;
+        }
+
+        buffer[06]              = i;
+        memcpy(&buffer[ASUSAURACORELAPTOP_DATA_BYTE], &key_buf[3 * i], (3 * buffer[07]));
+
+        hid_send_feature_report(dev, buffer, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE);
+    }
+
+    buffer[4] = 0x04;
+    buffer[5] = 0x00;
+    buffer[6] = 0x00;
+    buffer[7] = 0x00;
+    memcpy(&buffer[ASUSAURACORELAPTOP_DATA_BYTE], &key_buf[3 * key_set], (3 * (led_count - key_set)));
+
+    hid_send_feature_report(dev, buffer, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE);
+}
+
+void AsusAuraCoreLaptopController::SendBrightness()
+{
+    const uint8_t index                                     = 2;
+    uint8_t buffer[ASUSAURACORELAPTOP_WRITE_PACKET_SIZE]    = { ASUSAURACORELAPTOP_REPORT_ID, ASUSAURACORELAPTOP_CMD_BRIGHTNESS };
+
+    memset(&buffer[index], 0, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE - index);
+    buffer[4] = current_brightness;
+
+    hid_send_feature_report(dev, buffer, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE);
+}
+
+void AsusAuraCoreLaptopController::SendUpdate()
+{
+    uint8_t buffer[ASUSAURACORELAPTOP_WRITE_PACKET_SIZE]    = { ASUSAURACORELAPTOP_REPORT_ID, ASUSAURACORELAPTOP_CMD_UPDATE };
+
+    buffer[ASUSAURACORELAPTOP_ZONE_BYTE]                    = 0;
+    buffer[ASUSAURACORELAPTOP_MODE_BYTE]                    = current_mode;
+    buffer[ASUSAURACORELAPTOP_R1_BYTE]                      = RGBGetRValue(current_c1);
+    buffer[ASUSAURACORELAPTOP_G1_BYTE]                      = RGBGetGValue(current_c1);
+    buffer[ASUSAURACORELAPTOP_B1_BYTE]                      = RGBGetBValue(current_c1);
+    buffer[ASUSAURACORELAPTOP_SPEED_BYTE]                   = current_speed;
+    buffer[ASUSAURACORELAPTOP_DIRECTION_BYTE]               = current_direction;
+    buffer[ASUSAURACORELAPTOP_DATA_BYTE]                    = current_random;
+    buffer[ASUSAURACORELAPTOP_R2_BYTE]                      = RGBGetRValue(current_c2);
+    buffer[ASUSAURACORELAPTOP_G2_BYTE]                      = RGBGetGValue(current_c2);
+    buffer[ASUSAURACORELAPTOP_B2_BYTE]                      = RGBGetBValue(current_c2);
+
+    hid_send_feature_report(dev, buffer, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE);
+
+    SendApply();
+}
+
+void AsusAuraCoreLaptopController::SendApply()
+{
+    const uint8_t index                                     = 2;
+    uint8_t buffer[ASUSAURACORELAPTOP_WRITE_PACKET_SIZE]    = { ASUSAURACORELAPTOP_REPORT_ID, ASUSAURACORELAPTOP_CMD_APPLY };
+
+    memset(&buffer[index], 0, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE - index);
+
+    hid_send_feature_report(dev, buffer, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE);
+}
+
+void AsusAuraCoreLaptopController::SendSet()
+{
+    const uint8_t index                                     = 2;
+    uint8_t buffer[ASUSAURACORELAPTOP_WRITE_PACKET_SIZE]    = { ASUSAURACORELAPTOP_REPORT_ID, ASUSAURACORELAPTOP_CMD_SET };
+
+    memset(&buffer[index], 0, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE - index);
+
+    hid_send_feature_report(dev, buffer, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE);
+}
+
+std::vector<p_state> AsusAuraCoreLaptopController::PowerConfigArray()
+{
+    std::vector<p_state>    temp;
+
+    for(uint8_t zone_index = 0; zone_index < ASUSAURACORELAPTOP_POWER_ZONES; zone_index++)
+    {
+        for(uint8_t state_index = 0; state_index < ASUSAURACORELAPTOP_POWER_STATES; state_index++)
+        {
+            p_state new_state;
+
+            new_state.zone  = power_zones[zone_index] + power_states[state_index];
+            new_state.state = true;
+
+            temp.push_back(new_state);
+        }
+    }
+
+    return temp;
+}
+
+void AsusAuraCoreLaptopController::SetPowerConfigFromJSON()
+{
+    std::vector<p_state> power_config   = PowerConfigArray();
+    const std::string section_power     = "PowerConfig";
+    const std::string detector_name     = "Asus Aura Core Laptop";
+    SettingsManager* settings_manager   = ResourceManager::get()->GetSettingsManager();
+    json device_settings                = settings_manager->GetSettings(detector_name);
+
+    /*---------------------------------------------------------*\
+    | Get Power state config from the settings manager          |
+    |   If PowerConfig is not found then write it to settings   |
+    \*---------------------------------------------------------*/
+    if(!device_settings.contains(section_power))
+    {
+        json pcfg;
+
+        for(size_t i = 0; i < power_config.size(); i++)
+        {
+            pcfg[power_config[i].zone]  = power_config[i].state;
+        }
+
+        device_settings[section_power]  = pcfg;
+        settings_manager->SetSettings(detector_name, device_settings);
+        settings_manager->SaveSettings();
+    }
+    else
+    {
+        for(size_t i = 0; i < power_config.size(); i++)
+        {
+            std::string key_name        = power_config[i].zone;
+
+            if(device_settings[section_power].contains(key_name))
+            {
+                power_config[i].state   = device_settings[section_power][key_name];
+                LOG_DEBUG("[%s] Reading power config for %s: %s", device_name.c_str(), key_name.c_str(), ((power_config[i].state) ? "On" : "Off"));
+            }
+        }
+    }
+
+    /*-----------------------------------------------------------------------------*\
+    | Power state flags are packed in zones but the order is inconsistent.          |
+    |   With thanks to AsusCtl for helping to decipher the packet captures          |
+    |   https://gitlab.com/asus-linux/asusctl/-/blob/main/rog-aura/src/usb.rs#L150  |
+    \*-----------------------------------------------------------------------------*/
+    bool flag_array[] =
+    {
+        power_config[0].state,      power_config[4].state,
+        power_config[1].state,      power_config[5].state,
+        !power_config[2].state,     !power_config[6].state,
+        !power_config[3].state,     !power_config[7].state,
+
+        false,                      power_config[8].state,
+        power_config[9].state,      !power_config[10].state,
+        !power_config[11].state,    false,
+        false,                      false,
+
+        power_config[12].state,     power_config[13].state,
+        !power_config[14].state,    !power_config[15].state
+    };
+
+    uint32_t flags      = PackPowerFlags(flag_array);
+    LOG_DEBUG("[%s] Sending power config Logo+KB: %02X Lightbar: %02X Lid Edges: %02X Raw: %08X", device_name.c_str(), (flags & 0xFF), ((flags >> 8)  & 0xFF), ((flags >> 16)  & 0xFF), flags);
+    SendPowerConfig(flags);
+}
+
+void AsusAuraCoreLaptopController::SendPowerConfig(uint32_t flags)
+{
+    const uint8_t index                                     = 6;
+    uint8_t buffer[ASUSAURACORELAPTOP_WRITE_PACKET_SIZE]    = { ASUSAURACORELAPTOP_REPORT_ID, ASUSAURACORELAPTOP_CMD_POWER, 0x01, 0x00, 0x00, 0x0F };
+
+    memset(&buffer[index], 0, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE - index);
+
+    buffer[3] = flags           & 0xFF;
+    buffer[4] = (flags >> 8)    & 0xFF;
+    buffer[5] = (flags >> 16)   & 0xFF;
+
+    hid_send_feature_report(dev, buffer, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE);
+}
+
+uint32_t AsusAuraCoreLaptopController::PackPowerFlags(bool flags[])
+{
+    uint32_t temp = {};
+    const uint8_t length = 32;
+
+    for (size_t i = 0; i < length; ++i)
+    {
+        uint32_t flag = {flags[i]};
+        flag <<= i;
+        temp |= flag;
+    }
+
+    return temp;
+}

Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController.h

@@ -0,0 +1,135 @@
+/*---------------------------------------------------------------------*\
+|  AsusAuraCoreLaptopController.h                                       |
+|                                                                       |
+|  Driver for AsusAuraCoreLaptop USB Controller                         |
+|                                                                       |
+|  Chris M (Dr_No)          28 Jul 2022                                 |
+|                                                                       |
+\*---------------------------------------------------------------------*/
+
+#include <string>
+#include <vector>
+#include <hidapi/hidapi.h>
+#include "LogManager.h"
+#include "RGBController.h"
+#include "ResourceManager.h"
+#include "SettingsManager.h"
+#include "RGBControllerKeyNames.h"
+
+#pragma once
+
+#define NA                                      0xFFFFFFFF
+#define HID_MAX_STR                             255
+#define ASUSAURACORELAPTOP_TIMEOUT              250
+#define ASUSAURACORELAPTOP_READ_PACKET_SIZE     64
+#define ASUSAURACORELAPTOP_WRITE_PACKET_SIZE    64   //Buffer requires a prepended ReportID hence + 1
+
+#define ASUSAURACORELAPTOP_KEYCOUNT             91
+#define ASUSAURACORELAPTOP_KEY_WIDTH            18
+#define ASUSAURACORELAPTOP_KEY_HEIGHT           7
+#define ASUSAURACORELAPTOP_LIGHTBARCOUNT        6
+#define ASUSAURACORELAPTOP_LIDCOUNT             3
+#define ASUSAURACORELAPTOP_POWER_ZONES          4
+#define ASUSAURACORELAPTOP_POWER_STATES         4
+#define ASUSAURACORELAPTOP_BRIGHTNESS_MIN       0
+#define ASUSAURACORELAPTOP_BRIGHTNESS_MAX       255
+
+enum
+{
+    ASUSAURACORELAPTOP_MODE_OFF                 = 0x00, //Turn off - All leds off
+    ASUSAURACORELAPTOP_MODE_DIRECT              = 0xFF, //Direct Led Control - Independently set LEDs in zone
+    ASUSAURACORELAPTOP_MODE_STATIC              = 0x00, //Static Mode - Set entire zone to a single color.
+    ASUSAURACORELAPTOP_MODE_BREATHING           = 0x01, //Breathing Mode - Fades between fully off and fully on.
+    ASUSAURACORELAPTOP_MODE_SPECTRUM            = 0x02, //Spectrum Cycle Mode - Cycles through the color spectrum on all lights on the device
+    ASUSAURACORELAPTOP_MODE_RAINBOW             = 0x03, //Rainbow Wave Mode - Cycle thru the color spectrum as a wave across all LEDs
+    ASUSAURACORELAPTOP_MODE_FLASHING            = 0x0A, //Flashing Mode - Abruptly changing between fully off and fully on.
+
+    /*-------------------------------------------------*\
+    | Modes not implemented in the Armoury Crate        |
+    |   OEM software that were discovered.              |
+    \*-------------------------------------------------*/
+    ASUSAURACORELAPTOP_MODE_STARRY_NIGHT        = 0x04, //Starry Night Mode
+    ASUSAURACORELAPTOP_MODE_RAIN                = 0x05, //Rain Mode
+    ASUSAURACORELAPTOP_MODE_REACT_FADE          = 0x06, //Reactive Fade Mode
+    ASUSAURACORELAPTOP_MODE_REACT_LASER         = 0x07, //Reactive Laser Mode
+    ASUSAURACORELAPTOP_MODE_REACT_RIPPLE        = 0x08, //Reactive Ripple Mode
+    ASUSAURACORELAPTOP_MODE_COMET               = 0x0B, //Comet Mode
+    ASUSAURACORELAPTOP_MODE_FLASHNDASH          = 0x0C, //Flash n Dash Mode
+    ASUSAURACORELAPTOP_MODE_KEYSTONE            = 0x0D, //Keystone Mode
+};
+
+enum
+{
+    ASUSAURACORELAPTOP_ZONE_BYTE                = 2,
+    ASUSAURACORELAPTOP_MODE_BYTE                = 3,
+    ASUSAURACORELAPTOP_R1_BYTE                  = 4,
+    ASUSAURACORELAPTOP_G1_BYTE                  = 5,
+    ASUSAURACORELAPTOP_B1_BYTE                  = 6,
+    ASUSAURACORELAPTOP_SPEED_BYTE               = 7,
+    ASUSAURACORELAPTOP_DIRECTION_BYTE           = 8,
+    ASUSAURACORELAPTOP_DATA_BYTE                = 9,
+    ASUSAURACORELAPTOP_R2_BYTE                  = 10,
+    ASUSAURACORELAPTOP_G2_BYTE                  = 11,
+    ASUSAURACORELAPTOP_B2_BYTE                  = 12,
+};
+
+enum
+{
+    ASUSAURACORELAPTOP_REPORT_ID                = 0x5D,
+    ASUSAURACORELAPTOP_CMD_BRIGHTNESS           = 0xBA,
+    ASUSAURACORELAPTOP_CMD_DIRECT               = 0xBC,
+    ASUSAURACORELAPTOP_CMD_POWER                = 0xBD,
+    ASUSAURACORELAPTOP_CMD_UPDATE               = 0xB3,
+    ASUSAURACORELAPTOP_CMD_APPLY                = 0xB4,
+    ASUSAURACORELAPTOP_CMD_SET                  = 0xB5,
+};
+
+enum
+{
+    ASUSAURACORELAPTOP_SPEED_SLOWEST            = 0xE1, // Slowest speed
+    ASUSAURACORELAPTOP_SPEED_NORMAL             = 0xEB, // Normal speed
+    ASUSAURACORELAPTOP_SPEED_FASTEST            = 0xF5, // Fastest speed
+};
+
+struct p_state
+{
+    std::string zone;
+    bool        state;
+};
+
+class AsusAuraCoreLaptopController
+{
+public:
+    AsusAuraCoreLaptopController(hid_device* dev_handle, const char* path);
+    ~AsusAuraCoreLaptopController();
+
+    std::string             GetDeviceName();
+    std::string             GetSerial();
+    std::string             GetLocation();
+
+    void                    SetMode(uint8_t mode, uint8_t speed, uint8_t brightness, RGBColor color1, RGBColor color2, uint8_t random, uint8_t direction);
+    void                    SetLedsDirect(std::vector<RGBColor> colors);
+private:
+    std::string             device_name;
+    std::string             location;
+    hid_device*             dev;
+
+    uint8_t                 current_mode;
+    uint8_t                 current_speed;
+    uint8_t                 current_direction;
+
+    RGBColor                current_c1;
+    RGBColor                current_c2;
+    uint8_t                 current_brightness;
+    uint8_t                 current_random;
+
+    void                    SendApply();
+    void                    SendBrightness();
+    void                    SendSet();
+    void                    SendUpdate();
+
+    void                    SetPowerConfigFromJSON();
+    void                    SendPowerConfig(uint32_t flags);
+    uint32_t                PackPowerFlags(bool flags[]);
+    std::vector<p_state>    PowerConfigArray();
+};

Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp

@@ -10,9 +10,10 @@
 
 /**------------------------------------------------------------------*\
     @name Asus AURA Core
+    @category Keyboard,LEDStrip
     @type USB
     @save :x:
-    @direct :warning:
+    @direct :rotating_light:
     @effects :white_check_mark:
     @detectors DetectAsusAuraCoreControllers
     @comment
@@ -25,7 +26,7 @@ RGBController_AuraCore::RGBController_AuraCore(AuraCoreController* controller_pt
     name        = "ASUS Aura Core Device";
     vendor      = "ASUS";
     location    = controller->GetDeviceLocation();
-    serial      = controller->GetSerialString();    
+    serial      = controller->GetSerialString();
     description = "ASUS Aura Core Device";
     type        = DEVICE_TYPE_UNKNOWN;
 
@@ -43,39 +44,39 @@ RGBController_AuraCore::RGBController_AuraCore(AuraCoreController* controller_pt
 
 void RGBController_AuraCore::SetupKeyboard()
 {
-    name        = "ASUS Aura Keyboard";
-    vendor      = "ASUS";
-    type        = DEVICE_TYPE_KEYBOARD;
-    description = "ASUS Aura Core Device";
+    name                    = "ASUS Aura Keyboard";
+    vendor                  = "ASUS";
+    type                    = DEVICE_TYPE_KEYBOARD;
+    description             = "ASUS Aura Core Device";
 
     mode Static;
-    Static.name       = "Static";
-    Static.value      = AURA_CORE_MODE_STATIC;
-    Static.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
-    Static.color_mode = MODE_COLORS_PER_LED;
+    Static.name             = "Static";
+    Static.value            = AURA_CORE_MODE_STATIC;
+    Static.flags            = MODE_FLAG_HAS_PER_LED_COLOR;
+    Static.color_mode       = MODE_COLORS_PER_LED;
     modes.push_back(Static);
 
     mode Breathing;
-    Breathing.name       = "Breathing";
-    Breathing.value      = AURA_CORE_MODE_BREATHING;
-    Breathing.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
-    Breathing.color_mode = MODE_COLORS_PER_LED;
+    Breathing.name          = "Breathing";
+    Breathing.value         = AURA_CORE_MODE_BREATHING;
+    Breathing.flags         = MODE_FLAG_HAS_PER_LED_COLOR;
+    Breathing.color_mode    = MODE_COLORS_PER_LED;
     modes.push_back(Breathing);
 
     mode ColorCycle;
-    ColorCycle.name       = "Color Cycle";
-    ColorCycle.value      = AURA_CORE_MODE_SPECTRUM_CYCLE;
-    ColorCycle.flags      = 0;
-    ColorCycle.color_mode = MODE_COLORS_NONE;
+    ColorCycle.name         = "Color Cycle";
+    ColorCycle.value        = AURA_CORE_MODE_SPECTRUM_CYCLE;
+    ColorCycle.flags        = 0;
+    ColorCycle.color_mode   = MODE_COLORS_NONE;
     modes.push_back(ColorCycle);
 }
 
 void RGBController_AuraCore::SetupGA15DH()
 {
-    name        = "ASUS Aura GA15DH";
-    vendor      = "ASUS";
-    type        = DEVICE_TYPE_LEDSTRIP;
-    description = "ASUS Aura Core Device";
+    name                    = "ASUS Aura GA15DH";
+    vendor                  = "ASUS";
+    type                    = DEVICE_TYPE_LEDSTRIP;
+    description             = "ASUS Aura Core Device";
 
     mode Static;
     Static.name             = "Static";
@@ -159,10 +160,10 @@ void RGBController_AuraCore::SetupGA15DH()
     modes.push_back(Irradiation);
 
     mode Direct;
-    Static.name       = "Direct";
-    Static.value      = AURA_CORE_MODE_DIRECT;
-    Static.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
-    Static.color_mode = MODE_COLORS_PER_LED;
+    Static.name             = "Direct";
+    Static.value            = AURA_CORE_MODE_DIRECT;
+    Static.flags            = MODE_FLAG_HAS_PER_LED_COLOR;
+    Static.color_mode       = MODE_COLORS_PER_LED;
     modes.push_back(Static);
 }
 
@@ -311,11 +312,6 @@ void RGBController_AuraCore::UpdateSingleLED(int led)
     controller->SendApply();
 }
 
-void RGBController_AuraCore::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_AuraCore::DeviceUpdateMode()
 {
     if(modes[active_mode].value == AURA_CORE_MODE_DIRECT)

Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.h

@@ -27,7 +27,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:

Controllers/AsusAuraCoreController/RGBController_AsusAuraCoreLaptop.cpp

@@ -0,0 +1,491 @@
+/*---------------------------------------------------------------------*\
+|  RGBController_AsusAuraCoreLaptop.cpp                                 |
+|                                                                       |
+|  Driver for AsusAuraCoreLaptop USB Controller                         |
+|                                                                       |
+|  Chris M (Dr_No)          28 Jul 2022                                 |
+|                                                                       |
+\*---------------------------------------------------------------------*/
+
+#include "RGBController_AsusAuraCoreLaptop.h"
+
+static unsigned int matrix_map[ASUSAURACORELAPTOP_KEY_HEIGHT][ASUSAURACORELAPTOP_KEY_WIDTH] =
+{
+    {  NA,  NA,  86,  87,  88,  89,  90,  NA,  NA,  NA,  NA,  NA,  NA,  NA,  NA,  NA,  NA,  NA },
+    {   0,  NA,   1,   2,   3,   4,  NA,   5,   6,   7,   8,  NA,   9,  10,  11,  12,  13,  NA },
+    {  14,  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  30,  NA },
+    {  31,  NA,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,  NA,  45,  NA },
+    {  46,  NA,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  NA,  58,  NA,  59,  NA },
+    {  60,  NA,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  NA,  72,  NA,  73,  NA },
+    {  74,  75,  76,  77,  NA,  NA,  NA,  78,  NA,  NA,  NA,  79,  80,  81,  82,  83,  84,  85 }
+};
+
+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,                 //10
+    KEY_EN_F11,
+    KEY_EN_F12,
+    KEY_EN_DELETE,
+
+    KEY_EN_BACK_TICK,
+    KEY_EN_1,
+    KEY_EN_2,
+    KEY_EN_3,
+    KEY_EN_4,
+    KEY_EN_5,
+    KEY_EN_6,                   //20
+    KEY_EN_7,
+    KEY_EN_8,
+    KEY_EN_9,
+    KEY_EN_0,
+    KEY_EN_MINUS,
+    KEY_EN_EQUALS,
+    KEY_EN_BACKSPACE,
+    KEY_EN_BACKSPACE,
+    KEY_EN_BACKSPACE,
+    KEY_EN_MEDIA_PLAY_PAUSE,    //30
+
+    KEY_EN_TAB,
+    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,                   //40
+    KEY_EN_P,
+    KEY_EN_LEFT_BRACKET,
+    KEY_EN_RIGHT_BRACKET,
+    KEY_EN_ANSI_BACK_SLASH,
+    KEY_EN_MEDIA_STOP,
+
+    KEY_EN_CAPS_LOCK,
+    KEY_EN_A,
+    KEY_EN_S,
+    KEY_EN_D,
+    KEY_EN_F,                   //50
+    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_MEDIA_PREVIOUS,
+
+    KEY_EN_LEFT_SHIFT,          //60
+    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,       //70
+    KEY_EN_RIGHT_SHIFT,
+    KEY_EN_UP_ARROW,
+    KEY_EN_MEDIA_NEXT,
+
+    KEY_EN_LEFT_CONTROL,
+    KEY_EN_LEFT_FUNCTION,
+    KEY_EN_LEFT_WINDOWS,
+    KEY_EN_LEFT_ALT,
+    KEY_EN_SPACE,
+    KEY_EN_RIGHT_ALT,
+    KEY_EN_RIGHT_CONTROL,       //80
+    KEY_EN_LEFT_ARROW,
+    KEY_EN_DOWN_ARROW,
+    KEY_EN_RIGHT_ARROW,
+    KEY_EN_PRINT_SCREEN,
+    "Asus Keystone",
+
+    KEY_EN_MEDIA_VOLUME_DOWN,
+    KEY_EN_MEDIA_VOLUME_UP,
+    "Key: Mic On/Off",
+    "Key: HyperFan",
+    "Key: Armoury Crate",       //90
+
+    "Lightbar LED 1",
+    "Lightbar LED 2",
+    "Lightbar LED 3",
+    "Lightbar LED 4",
+    "Lightbar LED 5",
+    "Lightbar LED 6",
+
+    "Logo",
+    "Lid Left",
+    "Lid Right",                //99
+};
+
+/**------------------------------------------------------------------*\
+    @name AsusAuraCoreLaptop
+    @category DEVICE_TYPE_KEYBOARD
+    @type USB
+    @save :x:
+    @direct :white_check_mark:
+    @effects :white_check_mark:
+    @detectors DetectAsusAuraCoreLaptopControllers
+    @comment Power profiles for this controller are set to `On` for all power
+        state and scan be adjusted in the JSON config file.
+
+        For each zone available LEDs can be set as `On = true` or `Off = false` when
+        * Booting
+        * Awake (Normal Usage)
+        * Sleeping
+        * Shutdown / Power Off
+\*-------------------------------------------------------------------*/
+
+RGBController_AsusAuraCoreLaptop::RGBController_AsusAuraCoreLaptop(AsusAuraCoreLaptopController *controller_ptr)
+{
+    controller                  = controller_ptr;
+
+    name                        = "Asus Aura Core Laptop";
+    vendor                      = "Asus";
+    type                        = DEVICE_TYPE_KEYBOARD;
+    description                 = controller->GetDeviceName();
+    serial                      = controller->GetSerial();
+    location                    = controller->GetLocation();
+
+    mode Direct;
+    Direct.name                 = "Direct";
+    Direct.value                = ASUSAURACORELAPTOP_MODE_DIRECT;
+    Direct.flags                = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode           = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
+    mode Static;
+    Static.name                 = "Static";
+    Static.value                = ASUSAURACORELAPTOP_MODE_STATIC;
+    Static.flags                = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS;
+    Static.colors_min           = 1;
+    Static.colors_max           = 1;
+    Static.colors.resize(Static.colors_max);
+    Static.brightness_min       = ASUSAURACORELAPTOP_BRIGHTNESS_MIN;
+    Static.brightness_max       = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    Static.brightness           = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    Static.speed_min            = ASUSAURACORELAPTOP_SPEED_SLOWEST;
+    Static.speed_max            = ASUSAURACORELAPTOP_SPEED_FASTEST;
+    Static.color_mode           = MODE_COLORS_MODE_SPECIFIC;
+    Static.speed                = ASUSAURACORELAPTOP_SPEED_NORMAL;
+    modes.push_back(Static);
+
+    mode Breathing;
+    Breathing.name              = "Breathing";
+    Breathing.value             = ASUSAURACORELAPTOP_MODE_BREATHING;
+    Breathing.flags             = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_HAS_BRIGHTNESS;
+    Breathing.colors_min        = 1;
+    Breathing.colors_max        = 2;
+    Breathing.colors.resize(Breathing.colors_min);
+    Breathing.brightness_min    = ASUSAURACORELAPTOP_BRIGHTNESS_MIN;
+    Breathing.brightness_max    = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    Breathing.brightness        = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    Breathing.speed_min         = ASUSAURACORELAPTOP_SPEED_SLOWEST;
+    Breathing.speed_max         = ASUSAURACORELAPTOP_SPEED_FASTEST;
+    Breathing.color_mode        = MODE_COLORS_MODE_SPECIFIC;
+    Breathing.speed             = ASUSAURACORELAPTOP_SPEED_NORMAL;
+    modes.push_back(Breathing);
+
+    mode Flashing;
+    Flashing.name               = "Flashing";
+    Flashing.value              = ASUSAURACORELAPTOP_MODE_FLASHING;
+    Flashing.flags              = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_HAS_BRIGHTNESS;
+    Flashing.colors_min         = 1;
+    Flashing.colors_max         = 1;
+    Flashing.colors.resize(Flashing.colors_max);
+    Flashing.brightness_min     = ASUSAURACORELAPTOP_BRIGHTNESS_MIN;
+    Flashing.brightness_max     = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    Flashing.brightness         = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    Flashing.speed_min          = ASUSAURACORELAPTOP_SPEED_SLOWEST;
+    Flashing.speed_max          = ASUSAURACORELAPTOP_SPEED_FASTEST;
+    Flashing.color_mode         = MODE_COLORS_MODE_SPECIFIC;
+    Flashing.speed              = ASUSAURACORELAPTOP_SPEED_NORMAL;
+    modes.push_back(Flashing);
+
+    mode Spectrum;
+    Spectrum.name               = "Spectrum Cycle";
+    Spectrum.value              = ASUSAURACORELAPTOP_MODE_SPECTRUM;
+    Spectrum.flags              = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS;
+    Spectrum.brightness_min     = ASUSAURACORELAPTOP_BRIGHTNESS_MIN;
+    Spectrum.brightness_max     = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    Spectrum.brightness         = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    Spectrum.speed_min          = ASUSAURACORELAPTOP_SPEED_SLOWEST;
+    Spectrum.speed_max          = ASUSAURACORELAPTOP_SPEED_FASTEST;
+    Spectrum.color_mode         = MODE_COLORS_NONE;
+    Spectrum.speed              = ASUSAURACORELAPTOP_SPEED_NORMAL;
+    modes.push_back(Spectrum);
+
+    mode Rainbow;
+    Rainbow.name                = "Rainbow Wave";
+    Rainbow.value               = ASUSAURACORELAPTOP_MODE_RAINBOW;
+    Rainbow.flags               = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_DIRECTION_UD;
+    Rainbow.brightness_min      = ASUSAURACORELAPTOP_BRIGHTNESS_MIN;
+    Rainbow.brightness_max      = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    Rainbow.brightness          = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    Rainbow.speed_min           = ASUSAURACORELAPTOP_SPEED_SLOWEST;
+    Rainbow.speed_max           = ASUSAURACORELAPTOP_SPEED_FASTEST;
+    Rainbow.color_mode          = MODE_COLORS_NONE;
+    Rainbow.speed               = ASUSAURACORELAPTOP_SPEED_NORMAL;
+    modes.push_back(Rainbow);
+
+    mode Starry;
+    Starry.name                 = "Starry Night";
+    Starry.value                = ASUSAURACORELAPTOP_MODE_STARRY_NIGHT;
+    Starry.flags                = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_HAS_BRIGHTNESS;
+    Starry.colors_min           = 1;
+    Starry.colors_max           = 2;
+    Starry.colors.resize(Starry.colors_min);
+    Starry.brightness_min       = ASUSAURACORELAPTOP_BRIGHTNESS_MIN;
+    Starry.brightness_max       = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    Starry.brightness           = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    Starry.speed_min            = ASUSAURACORELAPTOP_SPEED_SLOWEST;
+    Starry.speed_max            = ASUSAURACORELAPTOP_SPEED_FASTEST;
+    Starry.color_mode           = MODE_COLORS_MODE_SPECIFIC;
+    Starry.speed                = ASUSAURACORELAPTOP_SPEED_NORMAL;
+    modes.push_back(Starry);
+
+    mode Rain;
+    Rain.name                   = "Rain";
+    Rain.value                  = ASUSAURACORELAPTOP_MODE_RAIN;
+    Rain.flags                  = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS;
+    Rain.brightness_min         = ASUSAURACORELAPTOP_BRIGHTNESS_MIN;
+    Rain.brightness_max         = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    Rain.brightness             = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    Rain.speed_min              = ASUSAURACORELAPTOP_SPEED_SLOWEST;
+    Rain.speed_max              = ASUSAURACORELAPTOP_SPEED_FASTEST;
+    Rain.color_mode             = MODE_COLORS_NONE;
+    Rain.speed                  = ASUSAURACORELAPTOP_SPEED_NORMAL;
+    modes.push_back(Rain);
+
+    mode ReactFade;
+    ReactFade.name              = "Reactive - Fade";
+    ReactFade.value             = ASUSAURACORELAPTOP_MODE_REACT_FADE;
+    ReactFade.flags             = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_HAS_BRIGHTNESS;
+    ReactFade.colors_min        = 1;
+    ReactFade.colors_max        = 1;
+    ReactFade.colors.resize(ReactFade.colors_max);
+    ReactFade.brightness_min    = ASUSAURACORELAPTOP_BRIGHTNESS_MIN;
+    ReactFade.brightness_max    = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    ReactFade.brightness        = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    ReactFade.speed_min         = ASUSAURACORELAPTOP_SPEED_SLOWEST;
+    ReactFade.speed_max         = ASUSAURACORELAPTOP_SPEED_FASTEST;
+    ReactFade.color_mode        = MODE_COLORS_MODE_SPECIFIC;
+    ReactFade.speed             = ASUSAURACORELAPTOP_SPEED_NORMAL;
+    modes.push_back(ReactFade);
+
+    mode ReactLaser;
+    ReactLaser.name             = "Reactive - Laser";
+    ReactLaser.value            = ASUSAURACORELAPTOP_MODE_REACT_LASER;
+    ReactLaser.flags            = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_HAS_BRIGHTNESS;
+    ReactLaser.colors_min       = 1;
+    ReactLaser.colors_max       = 1;
+    ReactLaser.colors.resize(ReactLaser.colors_max);
+    ReactLaser.brightness_min   = ASUSAURACORELAPTOP_BRIGHTNESS_MIN;
+    ReactLaser.brightness_max   = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    ReactLaser.brightness       = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    ReactLaser.speed_min        = ASUSAURACORELAPTOP_SPEED_SLOWEST;
+    ReactLaser.speed_max        = ASUSAURACORELAPTOP_SPEED_FASTEST;
+    ReactLaser.color_mode       = MODE_COLORS_MODE_SPECIFIC;
+    ReactLaser.speed            = ASUSAURACORELAPTOP_SPEED_NORMAL;
+    modes.push_back(ReactLaser);
+
+    mode ReactRipple;
+    ReactRipple.name            = "Reactive - Ripple";
+    ReactRipple.value           = ASUSAURACORELAPTOP_MODE_REACT_RIPPLE;
+    ReactRipple.flags           = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_HAS_BRIGHTNESS;
+    ReactRipple.colors_min      = 1;
+    ReactRipple.colors_max      = 1;
+    ReactRipple.colors.resize(ReactRipple.colors_max);
+    ReactRipple.brightness_min  = ASUSAURACORELAPTOP_BRIGHTNESS_MIN;
+    ReactRipple.brightness_max  = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    ReactRipple.brightness      = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    ReactRipple.speed_min       = ASUSAURACORELAPTOP_SPEED_SLOWEST;
+    ReactRipple.speed_max       = ASUSAURACORELAPTOP_SPEED_FASTEST;
+    ReactRipple.color_mode      = MODE_COLORS_MODE_SPECIFIC;
+    ReactRipple.speed           = ASUSAURACORELAPTOP_SPEED_NORMAL;
+    modes.push_back(ReactRipple);
+
+    mode Comet;
+    Comet.name                  = "Comet";
+    Comet.value                 = ASUSAURACORELAPTOP_MODE_COMET;
+    Comet.flags                 = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_DIRECTION_LR;
+    Comet.colors_min            = 1;
+    Comet.colors_max            = 1;
+    Comet.colors.resize(Comet.colors_max);
+    Comet.brightness_min        = ASUSAURACORELAPTOP_BRIGHTNESS_MIN;
+    Comet.brightness_max        = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    Comet.brightness            = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    Comet.speed_min             = ASUSAURACORELAPTOP_SPEED_SLOWEST;
+    Comet.speed_max             = ASUSAURACORELAPTOP_SPEED_FASTEST;
+    Comet.color_mode            = MODE_COLORS_MODE_SPECIFIC;
+    Comet.speed                 = ASUSAURACORELAPTOP_SPEED_NORMAL;
+    modes.push_back(Comet);
+
+    mode FlashNDash;
+    FlashNDash.name             = "Flash N Dash";
+    FlashNDash.value            = ASUSAURACORELAPTOP_MODE_FLASHNDASH;
+    FlashNDash.flags            = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_DIRECTION_LR;
+    FlashNDash.colors_min       = 1;
+    FlashNDash.colors_max       = 1;
+    FlashNDash.colors.resize(FlashNDash.colors_max);
+    FlashNDash.brightness_min   = ASUSAURACORELAPTOP_BRIGHTNESS_MIN;
+    FlashNDash.brightness_max   = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    FlashNDash.brightness       = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    FlashNDash.speed_min        = ASUSAURACORELAPTOP_SPEED_SLOWEST;
+    FlashNDash.speed_max        = ASUSAURACORELAPTOP_SPEED_FASTEST;
+    FlashNDash.color_mode       = MODE_COLORS_MODE_SPECIFIC;
+    FlashNDash.speed            = ASUSAURACORELAPTOP_SPEED_NORMAL;
+    modes.push_back(FlashNDash);
+
+    mode Keystone;
+    Keystone.name               = "Keystone";
+    Keystone.value              = ASUSAURACORELAPTOP_MODE_KEYSTONE;
+    Keystone.flags              = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS;
+    Keystone.colors_min         = 1;
+    Keystone.colors_max         = 1;
+    Keystone.colors.resize(Keystone.colors_max);
+    Keystone.brightness_min     = ASUSAURACORELAPTOP_BRIGHTNESS_MIN;
+    Keystone.brightness_max     = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    Keystone.brightness         = ASUSAURACORELAPTOP_BRIGHTNESS_MAX;
+    Keystone.speed_min          = ASUSAURACORELAPTOP_SPEED_SLOWEST;
+    Keystone.speed_max          = ASUSAURACORELAPTOP_SPEED_FASTEST;
+    Keystone.color_mode         = MODE_COLORS_MODE_SPECIFIC;
+    Keystone.speed              = ASUSAURACORELAPTOP_SPEED_NORMAL;
+    modes.push_back(Keystone);
+
+    mode Off;
+    Off.name                    = "Off";
+    Off.value                   = ASUSAURACORELAPTOP_MODE_OFF;
+    Off.color_mode              = MODE_COLORS_NONE;
+    modes.push_back(Off);
+
+    Init_Controller();
+    SetupZones();
+}
+
+RGBController_AsusAuraCoreLaptop::~RGBController_AsusAuraCoreLaptop()
+{
+    delete controller;
+}
+
+void RGBController_AsusAuraCoreLaptop::Init_Controller()
+{
+    /*-------------------------------------------------*\
+    | Create the keyboard zone and add the matix map    |
+    \*-------------------------------------------------*/
+    zone KB_zone;
+    KB_zone.name                = "Keyboard Zone";
+    KB_zone.type                = ZONE_TYPE_MATRIX;
+    KB_zone.leds_min            = ASUSAURACORELAPTOP_KEYCOUNT;
+    KB_zone.leds_max            = ASUSAURACORELAPTOP_KEYCOUNT;
+    KB_zone.leds_count          = ASUSAURACORELAPTOP_KEYCOUNT;
+
+    KB_zone.matrix_map          = new matrix_map_type;
+    KB_zone.matrix_map->height  = ASUSAURACORELAPTOP_KEY_HEIGHT;
+    KB_zone.matrix_map->width   = ASUSAURACORELAPTOP_KEY_WIDTH;
+    KB_zone.matrix_map->map     = (unsigned int *)&matrix_map;
+    zones.push_back(KB_zone);
+
+    zone lightbar;
+    lightbar.name               = "Lightbar Zone";
+    lightbar.type               = ZONE_TYPE_LINEAR;
+    lightbar.leds_min           = ASUSAURACORELAPTOP_LIGHTBARCOUNT;
+    lightbar.leds_max           = ASUSAURACORELAPTOP_LIGHTBARCOUNT;
+    lightbar.leds_count         = ASUSAURACORELAPTOP_LIGHTBARCOUNT;
+    zones.push_back(lightbar);
+
+    zone lid;
+    lid.name                    = "Lid Zone";
+    lid.type                    = ZONE_TYPE_LINEAR;
+    lid.leds_min                = ASUSAURACORELAPTOP_LIDCOUNT;
+    lid.leds_max                = ASUSAURACORELAPTOP_LIDCOUNT;
+    lid.leds_count              = ASUSAURACORELAPTOP_LIDCOUNT;
+    zones.push_back(lid);
+}
+
+void RGBController_AsusAuraCoreLaptop::SetupZones()
+{
+    /*-------------------------------------------------*\
+    | Clear any existing color/LED configuration        |
+    \*-------------------------------------------------*/
+    leds.clear();
+    colors.clear();
+
+    /*---------------------------------------------------------*\
+    | Set up zones                                              |
+    \*---------------------------------------------------------*/
+    for(std::size_t zone_index = 0; zone_index < zones.size(); zone_index++)
+    {
+        int zone_offset = leds.size();
+
+        for(unsigned int led_index = 0; led_index < zones[zone_index].leds_count; led_index++)
+        {
+            led new_led;
+            new_led.value   = led_index + zone_offset;
+            new_led.name    = led_names[new_led.value];
+            leds.push_back(new_led);
+        }
+    }
+
+    SetupColors();
+}
+
+void RGBController_AsusAuraCoreLaptop::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_AsusAuraCoreLaptop::DeviceUpdateLEDs()
+{
+    controller->SetLedsDirect(colors);
+}
+
+void RGBController_AsusAuraCoreLaptop::UpdateZoneLEDs(int zone)
+{
+    std::vector<RGBColor> colour;
+    for(size_t i = 0; i < zones[zone].leds_count; i++)
+    {
+        colour.push_back(zones[zone].colors[i]);
+    }
+
+    controller->SetLedsDirect(colour);
+}
+
+void RGBController_AsusAuraCoreLaptop::UpdateSingleLED(int led)
+{
+    std::vector<RGBColor> colour;
+    colour.push_back(colors[led]);
+
+    controller->SetLedsDirect(colour);
+}
+
+void RGBController_AsusAuraCoreLaptop::DeviceUpdateMode()
+{
+    mode set_mode       = modes[active_mode];
+
+    if(set_mode.value == ASUSAURACORELAPTOP_MODE_DIRECT)
+    {
+        return;
+    }
+    uint8_t random      = (set_mode.color_mode == MODE_COLORS_RANDOM) ? 0xFF : 0;
+    RGBColor color1     = (set_mode.colors.size() > 0) ? set_mode.colors[0] : 0;
+    RGBColor color2     = (set_mode.colors.size() > 1) ? set_mode.colors[1] : 0;
+
+    controller->SetMode(set_mode.value, set_mode.speed, set_mode.brightness, color1, color2, random, set_mode.direction );
+}

Controllers/AsusAuraCoreController/RGBController_AsusAuraCoreLaptop.h

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------*\
+|  RGBController_AsusAuraCoreLaptop.h                                   |
+|                                                                       |
+|  Driver for AsusAuraCoreLaptop USB Controller                         |
+|                                                                       |
+|  Chris M (Dr_No)          28 Jul 2022                                 |
+|                                                                       |
+\*---------------------------------------------------------------------*/
+
+#pragma once
+
+#include <vector>
+#include "RGBController.h"
+#include "AsusAuraCoreLaptopController.h"
+
+class RGBController_AsusAuraCoreLaptop : public RGBController
+{
+public:
+    RGBController_AsusAuraCoreLaptop(AsusAuraCoreLaptopController* controller_ptr);
+    ~RGBController_AsusAuraCoreLaptop();
+
+    void                SetupZones();
+    void                ResizeZone(int zone, int new_size);
+
+    void                DeviceUpdateLEDs();
+    void                UpdateZoneLEDs(int zone);
+    void                UpdateSingleLED(int led);
+
+    void                DeviceUpdateMode();
+
+private:
+    void                Init_Controller();
+
+    AsusAuraCoreLaptopController*      controller;
+};

Controllers/AsusAuraGPUController/AsusAuraGPUControllerDetect.cpp

@@ -17,75 +17,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-using namespace std::chrono_literals;
-
-typedef struct
-{
-    int             pci_vendor;
-    int             pci_device;
-    int             pci_subsystem_vendor;
-    int             pci_subsystem_device;
-    unsigned char   controller_address;
-    const char *    name;
-} gpu_pci_device;
-
 #define ASUSGPU_CONTROLLER_NAME "ASUS Aura GPU"
-#define GPU_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ]))
-
-static const gpu_pci_device device_list[] =
-{
-    { NVIDIA_VEN,       NVIDIA_GTX1050_DEV,         ASUS_SUB_VEN,       ASUS_GTX1050_STRIX_O2G_GAMING,              0x29,   "ASUS ROG Strix GTX 1050 O2G Gaming"        },
-    { NVIDIA_VEN,       NVIDIA_GTX1050TI_DEV,       ASUS_SUB_VEN,       ASUS_ROG_STRIX_GTX1050TI_O4G_GAMING,        0x29,   "ASUS ROG Strix GTX 1050 TI O4G Gaming"     },
-    { NVIDIA_VEN,       NVIDIA_GTX1050TI_DEV,       ASUS_SUB_VEN,       ASUS_ROG_STRIX_GTX1050TI_O4G_GAMING_2,      0x29,   "ASUS ROG Strix GTX 1050 TI O4G Gaming"     },
-    { NVIDIA_VEN,       NVIDIA_GTX1060_DEV,         ASUS_SUB_VEN,       ASUS_GTX1060_STRIX_6G_GAMING,               0x29,   "ASUS GTX 1060 Strix 6G Gaming"             },
-    { NVIDIA_VEN,       NVIDIA_GTX1060_DEV,         ASUS_SUB_VEN,       ASUS_GTX1060_STRIX,                         0x29,   "ASUS GTX 1060 Strix"                       },
-    { NVIDIA_VEN,       NVIDIA_GTX1070_DEV,         ASUS_SUB_VEN,       ASUS_GTX1070_STRIX_GAMING,                  0x29,   "ASUS GTX 1070 Strix Gaming"                },
-    { NVIDIA_VEN,       NVIDIA_GTX1070_DEV,         ASUS_SUB_VEN,       ASUS_GTX1070_STRIX_OC,                      0x29,   "ASUS GTX 1070 Strix OC"                    },
-    { NVIDIA_VEN,       NVIDIA_GTX1070TI_DEV,       ASUS_SUB_VEN,       ASUS_ROG_STRIX_GTX1070TI_8G_GAMING,         0x29,   "ASUS ROG Strix GTX1070 Ti 8G Gaming"       },
-    { NVIDIA_VEN,       NVIDIA_GTX1070TI_DEV,       ASUS_SUB_VEN,       ASUS_ROG_STRIX_GTX1070TI_A8G_GAMING,        0x29,   "ASUS ROG Strix GTX1070 Ti A8G Gaming"      },
-    { NVIDIA_VEN,       NVIDIA_GTX1080_DEV,         ASUS_SUB_VEN,       ASUS_GTX1080_STRIX,                         0x29,   "ASUS GTX 1080 Strix OC"                    },
-    { NVIDIA_VEN,       NVIDIA_GTX1080_DEV,         ASUS_SUB_VEN,       ASUS_ROG_STRIX_GTX1080_A8G_GAMING,          0x29,   "ASUS ROG Strix GTX1080 A8G Gaming"         },
-    { NVIDIA_VEN,       NVIDIA_GTX1080_DEV,         ASUS_SUB_VEN,       ASUS_ROG_STRIX_GTX1080_O8G_GAMING,          0x29,   "ASUS ROG Strix GTX1080 O8G Gaming"         },
-    { NVIDIA_VEN,       NVIDIA_GTX1080TI_DEV,       ASUS_SUB_VEN,       ASUS_ROG_STRIX_GTX1080TI_GAMING,            0x29,   "ASUS ROG Strix GTX1080 Ti Gaming"          },
-    { NVIDIA_VEN,       NVIDIA_GTX1080TI_DEV,       ASUS_SUB_VEN,       ASUS_ROG_STRIX_GTX1080TI_11G_GAMING,        0x29,   "ASUS ROG Strix GTX1080 Ti 11G Gaming"      },
-    { NVIDIA_VEN,       NVIDIA_GTX1080TI_DEV,       ASUS_SUB_VEN,       ASUS_ROG_STRIX_GTX1080TI_O11G_GAMING,       0x29,   "ASUS ROG Strix GTX1080 Ti O11G Gaming"     },
-    { NVIDIA_VEN,       NVIDIA_GTX1080TI_DEV,       ASUS_SUB_VEN,       ASUS_ROG_STRIX_GTX1080TI_O11G_GAMING_A02,   0x29,   "ASUS ROG Strix GTX1080 Ti O11G Gaming"     },
-    { NVIDIA_VEN,       NVIDIA_GTX1650S_DEV,        ASUS_SUB_VEN,       ASUS_ROG_STRIX_GTX1650S_OC,                 0x2A,   "ASUS ROG Strix GTX 1650S OC 4G"            },
-    { NVIDIA_VEN,       NVIDIA_GTX1660S_DEV,        ASUS_SUB_VEN,       ASUS_ROG_STRIX_GTX1660S_O6G_GAMING,         0x2A,   "ASUS ROG Strix GTX 1660S O6G Gaming"       },
-    { NVIDIA_VEN,       NVIDIA_GTX1660TI_DEV,       ASUS_SUB_VEN,       ASUS_ROG_GTX1660TI_OC,                      0x2A,   "ASUS ROG GTX 1660 Ti OC 6G"                },
-    { NVIDIA_VEN,       NVIDIA_RTX2060_TU106_DEV,   ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2060_EVO_GAMING,          0x2A,   "ASUS ROG STRIX RTX 2060 EVO Gaming 6G"     },
-    { NVIDIA_VEN,       NVIDIA_RTX2060_TU106_DEV,   ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2060_O6G_GAMING,          0x2A,   "ASUS ROG STRIX RTX 2060 O6G Gaming 6G"     },
-    { NVIDIA_VEN,       NVIDIA_RTX2060_TU104_DEV,   ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2060_O6G_EVO_GAMING,      0x2A,   "ASUS ROG STRIX RTX 2060 O6G EVO Gaming"    },
-    { NVIDIA_VEN,       NVIDIA_RTX2060S_OC_DEV,     ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2060S_8G_GAMING,          0x2A,   "ASUS ROG STRIX RTX 2060S 8G Gaming 8G"     },
-    { NVIDIA_VEN,       NVIDIA_RTX2060S_DEV,        ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2060S_A8G_EVO_GAMING,     0x2A,   "ASUS ROG STRIX RTX 2060S A8G EVO Gaming 8G"},
-    { NVIDIA_VEN,       NVIDIA_RTX2060S_OC_DEV,     ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2060S_O8G_GAMING,         0x2A,   "ASUS ROG STRIX RTX 2060S O8G Gaming 8G"    },
-    { NVIDIA_VEN,       NVIDIA_RTX2060S_OC_DEV,     ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2060S_A8G_GAMING,         0x2A,   "ASUS ROG STRIX RTX 2060S A8G Gaming 8G"    },
-    { NVIDIA_VEN,       NVIDIA_RTX2070_OC_DEV,      ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2070_A8G_GAMING,          0x2A,   "ASUS ROG STRIX RTX 2070 A8G Gaming 8G"     },
-    { NVIDIA_VEN,       NVIDIA_RTX2070_OC_DEV,      ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2070_O8G_GAMING,          0x2A,   "ASUS ROG STRIX RTX 2070 O8G Gaming 8G"     },
-    { NVIDIA_VEN,       NVIDIA_RTX2070S_DEV,        ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2070S_A8G_GAMING_86FF,    0x2A,   "ASUS ROG STRIX RTX 2070S A8G Gaming 8G"    },
-    { NVIDIA_VEN,       NVIDIA_RTX2070S_OC_DEV,     ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2070S_A8G_GAMING,         0x2A,   "ASUS ROG STRIX RTX 2070S A8G Gaming 8G"    },
-    { NVIDIA_VEN,       NVIDIA_RTX2070S_OC_DEV,     ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2070S_A8G_GAMING_8706,    0x2A,   "ASUS ROG STRIX RTX 2070S A8G Gaming 8G"    },
-    { NVIDIA_VEN,       NVIDIA_RTX2070S_OC_DEV,     ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2070S_O8G_GAMING_8729,    0x2A,   "ASUS ROG STRIX RTX 2070S O8G Gaming"       },
-    { NVIDIA_VEN,       NVIDIA_RTX2070S_OC_DEV,     ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2070S_8G_GAMING_8707,     0x2A,   "ASUS ROG STRIX RTX 2070S 8G Gaming"        },
-    { NVIDIA_VEN,       NVIDIA_RTX2070S_OC_DEV,     ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2070S_O8G_GAMING,         0x2A,   "ASUS ROG STRIX RTX 2070S O8G Gaming 8G"    },
-    { NVIDIA_VEN,       NVIDIA_RTX2080_A_DEV,       ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2080_O8G_GAMING,          0x2A,   "ASUS ROG STRIX RTX 2080 O8G Gaming"        },
-    { NVIDIA_VEN,       NVIDIA_RTX2080S_DEV,        ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2080S_A8G_GAMING,         0x2A,   "ASUS ROG STRIX RTX 2080S A8G Gaming"       },
-    { NVIDIA_VEN,       NVIDIA_RTX2080S_DEV,        ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2080S_O8G_GAMING,         0x2A,   "ASUS ROG STRIX RTX 2080S O8G Gaming"       },
-    { NVIDIA_VEN,       NVIDIA_RTX2080S_DEV,        ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2080S_O8G_WHITE,          0x2A,   "ASUS ROG STRIX RTX 2080S O8G White"        },
-    { NVIDIA_VEN,       NVIDIA_RTX2080TI_DEV,       ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2080TI_11G_GAMING,        0x2A,   "ASUS ROG STRIX RTX 2080 Ti 11G Gaming"     },
-    { NVIDIA_VEN,       NVIDIA_RTX2080TI_A_DEV,     ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2080TI_O11G_GAMING,       0x2A,   "ASUS ROG STRIX RTX 2080 Ti O11G Gaming"    },
-    { NVIDIA_VEN,       NVIDIA_RTX2080TI_A_DEV,     ASUS_SUB_VEN,       ASUS_ROG_STRIX_RTX2080TI_A11G_GAMING,       0x2A,   "ASUS ROG STRIX RTX 2080 Ti A11G Gaming"    },
-    { NVIDIA_VEN,       NVIDIA_RTX3060TI_LHR_DEV,   ASUS_SUB_VEN,       ASUS_TUF_RTX_3060_TI_O8G_OC,                0x2A,   "ASUS TUF RTX 3060 Ti 8G Gaming OC"         },
-    { AMD_GPU_VEN,      AMD_VEGA10_DEV,             ASUS_SUB_VEN,       ASUS_AREZ_STRIX_VEGA56_08G_GAMING,          0x29,   "ASUS AREZ Strix RX Vega 56 O8G"            },
-    { AMD_GPU_VEN,      AMD_VEGA10_DEV,             ASUS_SUB_VEN,       ASUS_VEGA64_STRIX,                          0x29,   "ASUS Vega 64 Strix"                        },
-    { AMD_GPU_VEN,      AMD_NAVI10_DEV,             ASUS_SUB_VEN,       ASUS_RX5600XT_STRIX_O6G_GAMING,             0x2A,   "ASUS RX 5600XT Strix O6G Gaming"           },
-    { AMD_GPU_VEN,      AMD_NAVI10_DEV,             ASUS_SUB_VEN,       ASUS_RX5700XT_STRIX_GAMING_OC,              0x2A,   "ASUS RX 5700XT Strix Gaming OC"            },
-    { AMD_GPU_VEN,      AMD_POLARIS_DEV,            ASUS_SUB_VEN,       ASUS_RX480_STRIX_GAMING_OC,                 0x29,   "ASUS ROG STRIX RX480 Gaming OC"            },
-    { AMD_GPU_VEN,      AMD_POLARIS11,              ASUS_SUB_VEN,       ASUS_RX560_STRIX_4G_GAMING,                 0x29,   "ASUS ROG STRIX RX560 Gaming"               },
-    { AMD_GPU_VEN,      AMD_POLARIS_DEV,            ASUS_SUB_VEN,       ASUS_RX570_STRIX_O4G_GAMING_OC,             0x29,   "ASUS RX 570 Strix O4G Gaming OC"           },
-    { AMD_GPU_VEN,      AMD_POLARIS_DEV,            ASUS_SUB_VEN,       ASUS_RX580_STRIX_GAMING_OC,                 0x29,   "ASUS RX 580 Strix Gaming OC"               },
-    { AMD_GPU_VEN,      AMD_POLARIS_DEV,            ASUS_SUB_VEN,       ASUS_RX580_STRIX_GAMING_TOP,                0x29,   "ASUS RX 580 Strix Gaming TOP"              },
-};  
 
 /******************************************************************************************\
 *                                                                                          *
@@ -99,8 +31,8 @@ bool TestForAsusAuraGPUController(i2c_smbus_interface* bus, unsigned char addres
 {
     bool pass = false;
 
-    unsigned char aura_gpu_magic_high = bus->i2c_smbus_read_byte_data(address, 0x20);                        // High Byte of magic (0x15)                        
-    unsigned char aura_gpu_magic_low = bus->i2c_smbus_read_byte_data(address, 0x21);                         // Low Byte of magic (0x89)
+    unsigned char aura_gpu_magic_high = bus->i2c_smbus_read_byte_data(address, 0x20);   // High Byte of magic (0x15)
+    unsigned char aura_gpu_magic_low  = bus->i2c_smbus_read_byte_data(address, 0x21);   // Low Byte of magic (0x89)
 
     LOG_DEBUG("[%s] Test GPU expect: 0x1589 received: 0x%02X%02X", ASUSGPU_CONTROLLER_NAME, aura_gpu_magic_high, aura_gpu_magic_low);
 
@@ -121,29 +53,71 @@ bool TestForAsusAuraGPUController(i2c_smbus_interface* bus, unsigned char addres
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectAsusAuraGPUControllers(std::vector<i2c_smbus_interface*> &busses)
+void DetectAsusAuraGPUControllers(i2c_smbus_interface* bus, uint8_t i2c_addr, const std::string& name)
 {
-    for(unsigned int bus = 0; bus < busses.size(); bus++)
+    if(TestForAsusAuraGPUController(bus, i2c_addr))
     {
-        for(unsigned int dev_idx = 0; dev_idx < GPU_NUM_DEVICES; dev_idx++)
-        {
-            if(busses[bus]->pci_vendor           == device_list[dev_idx].pci_vendor           &&
-               busses[bus]->pci_device           == device_list[dev_idx].pci_device           &&
-               busses[bus]->pci_subsystem_vendor == device_list[dev_idx].pci_subsystem_vendor &&
-               busses[bus]->pci_subsystem_device == device_list[dev_idx].pci_subsystem_device)
-            {
-                LOG_DEBUG(GPU_DETECT_MESSAGE, ASUSGPU_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
-                
-                if(TestForAsusAuraGPUController(busses[bus], device_list[dev_idx].controller_address))
-                {
-                    AuraGPUController*     controller     = new AuraGPUController(busses[bus], device_list[dev_idx].controller_address);
-                    RGBController_AuraGPU* rgb_controller = new RGBController_AuraGPU(controller);
-                    rgb_controller->name = device_list[dev_idx].name;
-                    ResourceManager::get()->RegisterRGBController(rgb_controller);
-                }
-            }
-        }
+        AuraGPUController*     controller     = new AuraGPUController(bus, i2c_addr);
+        RGBController_AuraGPU* rgb_controller = new RGBController_AuraGPU(controller);
+        rgb_controller->name                  = name;
+
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
 } /* DetectAsusAuraGPUControllers() */
 
-REGISTER_I2C_DETECTOR(ASUSGPU_CONTROLLER_NAME, DetectAsusAuraGPUControllers);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX 1050 O2G Gaming"        , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1050_DEV,         ASUS_SUB_VEN,   ASUS_GTX1050_STRIX_O2G_GAMING,              0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX 1050 TI O4G Gaming"     , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1050TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1050TI_O4G_GAMING,        0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX 1050 TI O4G Gaming"     , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1050TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1050TI_O4G_GAMING_2,      0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS GTX 1060 Strix 6G Gaming"             , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1060_DEV,         ASUS_SUB_VEN,   ASUS_GTX1060_STRIX_6G_GAMING,               0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS GTX 1060 Strix"                       , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1060_DEV,         ASUS_SUB_VEN,   ASUS_GTX1060_STRIX,                         0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS GTX 1070 Strix Gaming"                , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1070_DEV,         ASUS_SUB_VEN,   ASUS_GTX1070_STRIX_GAMING,                  0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS GTX 1070 Strix OC"                    , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1070_DEV,         ASUS_SUB_VEN,   ASUS_GTX1070_STRIX_OC,                      0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX1070 Ti 8G Gaming"       , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1070TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1070TI_8G_GAMING,         0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX1070 Ti A8G Gaming"      , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1070TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1070TI_A8G_GAMING,        0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS GTX 1080 Strix OC"                    , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1080_DEV,         ASUS_SUB_VEN,   ASUS_GTX1080_STRIX,                         0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX1080 A8G Gaming"         , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1080_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1080_A8G_GAMING,          0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX1080 O8G Gaming"         , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1080_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1080_O8G_GAMING,          0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX1080 O8G 11Gbps"         , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1080_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1080_O8G_11GBPS,          0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX1080 Ti Gaming"          , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1080TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1080TI_GAMING,            0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX1080 Ti 11G Gaming"      , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1080TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1080TI_11G_GAMING,        0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX1080 Ti O11G Gaming"     , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1080TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1080TI_O11G_GAMING,       0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX1080 Ti O11G Gaming"     , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1080TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1080TI_O11G_GAMING_A02,   0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX 1650S OC 4G"            , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1650S_DEV,        ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1650S_OC,                 0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX 1660S O6G Gaming"       , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1660S_DEV,        ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1660S_O6G_GAMING,         0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG GTX 1660 Ti OC 6G"                , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1660TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_GTX1660TI_OC,                      0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2060 EVO Gaming 6G"     , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2060_TU106_DEV,   ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2060_EVO_GAMING,          0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2060 O6G Gaming 6G"     , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2060_TU106_DEV,   ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2060_O6G_GAMING,          0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2060 O6G EVO Gaming"    , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2060_TU104_DEV,   ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2060_O6G_EVO_GAMING,      0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2060S 8G Gaming 8G"     , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2060S_OC_DEV,     ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2060S_8G_GAMING,          0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2060S A8G EVO Gaming 8G", DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2060S_DEV,        ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2060S_A8G_EVO_GAMING,     0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2060S O8G Gaming 8G"    , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2060S_OC_DEV,     ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2060S_O8G_GAMING,         0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2060S A8G Gaming 8G"    , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2060S_OC_DEV,     ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2060S_A8G_GAMING,         0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2070 A8G Gaming 8G"     , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2070_OC_DEV,      ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2070_A8G_GAMING,          0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2070 O8G Gaming 8G"     , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2070_OC_DEV,      ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2070_O8G_GAMING,          0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2070S A8G Gaming 8G"    , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2070S_DEV,        ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2070S_A8G_GAMING_86FF,    0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2070S A8G Gaming 8G"    , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2070S_OC_DEV,     ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2070S_A8G_GAMING,         0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2070S A8G Gaming 8G"    , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2070S_OC_DEV,     ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2070S_A8G_GAMING_8706,    0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2070S O8G Gaming"       , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2070S_OC_DEV,     ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2070S_O8G_GAMING_8729,    0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2070S 8G Gaming"        , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2070S_OC_DEV,     ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2070S_8G_GAMING_8707,     0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2070S O8G Gaming 8G"    , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2070S_OC_DEV,     ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2070S_O8G_GAMING,         0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2080 O8G Gaming"        , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2080_A_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2080_O8G_GAMING,          0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2080 O8G V2 Gaming"     , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2080_A_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2080_O8G_V2_GAMING,       0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2080 8G Gaming"         , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2080_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2080_8G_GAMING,           0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2080S A8G Gaming"       , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2080S_DEV,        ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2080S_A8G_GAMING,         0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2080S O8G Gaming"       , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2080S_DEV,        ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2080S_O8G_GAMING,         0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2080S O8G White"        , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2080S_DEV,        ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2080S_O8G_WHITE,          0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2080 Ti 11G Gaming"     , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2080TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2080TI_11G_GAMING,        0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2080 Ti O11G Gaming"    , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2080TI_A_DEV,     ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2080TI_O11G_GAMING,       0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RTX 2080 Ti A11G Gaming"    , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2080TI_A_DEV,     ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2080TI_A11G_GAMING,       0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS TUF RTX 3060 Ti 8G Gaming OC"         , DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3060TI_LHR_DEV,   ASUS_SUB_VEN,   ASUS_TUF_RTX_3060_TI_O8G_OC,                0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS AREZ Strix RX Vega 56 O8G"            , DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_VEGA10_DEV,             ASUS_SUB_VEN,   ASUS_AREZ_STRIX_VEGA56_08G_GAMING,          0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS Vega 64 Strix"                        , DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_VEGA10_DEV,             ASUS_SUB_VEN,   ASUS_VEGA64_STRIX,                          0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS RX 5600XT Strix O6G Gaming"           , DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_NAVI10_DEV,             ASUS_SUB_VEN,   ASUS_RX5600XT_STRIX_O6G_GAMING,             0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS RX 5700XT Strix Gaming OC"            , DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_NAVI10_DEV,             ASUS_SUB_VEN,   ASUS_RX5700XT_STRIX_GAMING_OC,              0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS RX 6800 TUF Gaming OC"                , DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_NAVI21_DEV1,            ASUS_SUB_VEN,   ASUS_RX6800_TUF_GAMING_OC,                  0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RX480 Gaming OC"            , DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_POLARIS_DEV,            ASUS_SUB_VEN,   ASUS_RX480_STRIX_GAMING_OC,                 0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RX560 Gaming"               , DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_POLARIS11,              ASUS_SUB_VEN,   ASUS_RX560_STRIX_4G_GAMING,                 0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS RX 570 Strix O4G Gaming OC"           , DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_POLARIS_DEV,            ASUS_SUB_VEN,   ASUS_RX570_STRIX_O4G_GAMING_OC,             0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS RX 580 Strix Gaming OC"               , DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_POLARIS_DEV,            ASUS_SUB_VEN,   ASUS_RX580_STRIX_GAMING_OC,                 0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS RX 580 Strix Gaming TOP"              , DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_POLARIS_DEV,            ASUS_SUB_VEN,   ASUS_RX580_STRIX_GAMING_TOP,                0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS RX 6900XT TUF Gaming OC"              , DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_NAVI21_DEV1,            ASUS_SUB_VEN,   ASUS_TUF_RX6900XT_O16G_GAMING,              0x2A);

Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp

@@ -18,7 +18,7 @@ int RGBController_AuraGPU::GetDeviceMode()
         if (controller->direct)
         {
             dev_mode = AURA_GPU_MODE_DIRECT;
-        } 
+        }
     }
 
     switch(dev_mode)
@@ -35,7 +35,7 @@ int RGBController_AuraGPU::GetDeviceMode()
         {
             active_mode            = mode;
             modes[mode].color_mode = color_mode;
-        }   
+        }
     }
 
     return(active_mode);
@@ -43,10 +43,11 @@ int RGBController_AuraGPU::GetDeviceMode()
 
 /**------------------------------------------------------------------*\
     @name Asus Aura GPU
+    @category GPU
     @type SMBus
     @save :x:
     @direct :white_check_mark:
-    @effects :white_check_mark::
+    @effects :white_check_mark:
     @detectors DetectAsusAuraGPUControllers
     @comment
 \*-------------------------------------------------------------------*/
@@ -165,7 +166,7 @@ void RGBController_AuraGPU::DeviceUpdateLEDs()
         {
             controller->SetLEDColorsDirect(red, grn, blu);
         }
-        else 
+        else
         {
             controller->SetLEDColorsEffect(red, grn, blu);
         }
@@ -182,16 +183,11 @@ void RGBController_AuraGPU::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_AuraGPU::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_AuraGPU::DeviceUpdateMode()
 {
     int new_mode       = modes[active_mode].value;
     controller->direct = false;
-    
+
     switch(new_mode)
     {
         // Set all LEDs to 0 and Mode to static as a workaround for the non existing Off Mode
@@ -199,7 +195,7 @@ void RGBController_AuraGPU::DeviceUpdateMode()
             controller->SetLEDColorsEffect(0, 0, 0);
             new_mode           = AURA_GPU_MODE_STATIC;
             break;
-        
+
         // Direct mode is done by switching to Static and not applying color changes
         case AURA_GPU_MODE_DIRECT:
             controller->direct = true;

Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.h

@@ -25,7 +25,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:

Controllers/AsusAuraUSBController/AsusAuraMonitorController.cpp

@@ -12,10 +12,11 @@
 #include <cstring>
 #include "LogManager.h"
 
-AuraMonitorController::AuraMonitorController(hid_device* dev_handle, const char* path)
+AuraMonitorController::AuraMonitorController(hid_device* dev_handle, const char* path, uint16_t pid)
 {
     dev         = dev_handle;
     location    = path;
+    device_pid  = pid;
 }
 
 AuraMonitorController::~AuraMonitorController()
@@ -44,6 +45,27 @@ std::string AuraMonitorController::GetSerialString()
     return(return_string);
 }
 
+void AuraMonitorController::BeginUpdate()
+{
+    unsigned char usb_buf[8];
+
+    if (device_pid == AURA_ROG_PG32UQ_PID)
+    {
+        memset(usb_buf, 0x00, sizeof(usb_buf));
+
+        usb_buf[0x00]   = 0x03;
+        usb_buf[0x01]   = 0x02;
+        usb_buf[0x02]   = 0xA1;
+        usb_buf[0x03]   = 0x80;
+
+        usb_buf[0x04]   = 0x20;
+        hid_send_feature_report(dev, usb_buf, 8);
+
+        usb_buf[0x04]   = 0x30;
+        hid_send_feature_report(dev, usb_buf, 8);
+    }
+}
+
 void AuraMonitorController::UpdateLed
     (
     int             led,
@@ -58,7 +80,7 @@ void AuraMonitorController::UpdateLed
 
     usb_buf[0x00]   = 0x03;
     usb_buf[0x01]   = 0x02;
-    usb_buf[0x02]   = 0xa1;
+    usb_buf[0x02]   = 0xA1;
     usb_buf[0x03]   = 0x80;
 
     usb_buf[0x04]   = 16 + led * 3;
@@ -85,9 +107,9 @@ void AuraMonitorController::ApplyChanges()
 
     usb_buf[0x00]   = 0x03;
     usb_buf[0x01]   = 0x02;
-    usb_buf[0x02]   = 0xa1;
+    usb_buf[0x02]   = 0xA1;
     usb_buf[0x03]   = 0x80;
-    usb_buf[0x04]   = 0xa0;
+    usb_buf[0x04]   = 0xA0;
     usb_buf[0x05]   = 0x01;
     
     hid_send_feature_report(dev, usb_buf, 8);

Controllers/AsusAuraUSBController/AsusAuraMonitorController.h

@@ -13,18 +13,29 @@
 
 #pragma once
 
+enum
+{
+    AURA_ROG_STRIX_XG27AQ_PID    = 0x198C,
+    AURA_ROG_STRIX_XG27W_PID     = 0x1933,
+    AURA_ROG_PG32UQ_PID          = 0x19B9,
+};
+
+
 class AuraMonitorController
 {
 public:
-    AuraMonitorController(hid_device* dev_handle, const char* path);
+    AuraMonitorController(hid_device* dev_handle, const char* path, uint16_t pid);
     virtual ~AuraMonitorController();
 
     std::string GetDeviceLocation();
     std::string GetSerialString();
 
+    void BeginUpdate();
     void UpdateLed(int led, unsigned char red, unsigned char green, unsigned char blue);
     void ApplyChanges();
 
+    uint16_t                    device_pid;
+
 private:
     hid_device*                 dev;
     std::string                 location;

Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp

@@ -85,9 +85,9 @@ std::string AuraMouseController::GetVersion(bool wireless, int protocol)
 
         case 3:
             {
-                char version[9];
+                char version[16];
                 int offset = (wireless ? 13 : 4);
-                snprintf(version, 9, "%2d.%02d.%02d", usb_buf_out[offset + 1], usb_buf_out[offset + 2], usb_buf_out[offset + 3]);
+                snprintf(version, 16, "%2d.%02d.%02d", usb_buf_out[offset + 1], usb_buf_out[offset + 2], usb_buf_out[offset + 3]);
                 str = std::string(version);
             }
             break;

Controllers/AsusAuraUSBController/AsusAuraMouseDevices.h

@@ -11,27 +11,35 @@
 
 #pragma once
 
-#define AURA_ROG_GLADIUS_II_CORE_PID            0x18DD
-#define AURA_ROG_GLADIUS_II_PID                 0x1845
-#define AURA_ROG_GLADIUS_II_ORIGIN_PID          0x1877
-#define AURA_ROG_GLADIUS_II_ORIGIN_PNK_LTD_PID  0x18CD
-#define AURA_ROG_GLADIUS_II_ORIGIN_COD_PID      0x18B1
-#define AURA_ROG_GLADIUS_II_WIRELESS_1_PID      0x189E
-#define AURA_ROG_GLADIUS_II_WIRELESS_2_PID      0x18A0
-#define AURA_ROG_CHAKRAM_WIRELESS_PID           0x18E5
-#define AURA_ROG_CHAKRAM_WIRED_1_PID            0x18E3
-#define AURA_ROG_CHAKRAM_CORE_PID               0x1958
-#define AURA_ROG_PUGIO_PID                      0x1846
-#define AURA_ROG_PUGIO_II_WIRED_PID             0x1906
-#define AURA_ROG_PUGIO_II_WIRELESS_PID          0x1908
-#define AURA_ROG_STRIX_IMPACT_PID               0x1847
-#define AURA_ROG_STRIX_IMPACT_II_PID            0x18E1
-#define AURA_ROG_KERIS                          0x195C
-#define AURA_ROG_KERIS_WIRELESS_USB_PID         0x195E
-#define AURA_ROG_KERIS_WIRELESS_2_4_PID         0x1960
-#define AURA_ROG_KERIS_WIRELESS_BT_PID          0x1962
-#define AURA_TUF_M3_PID                         0x1910
-#define AURA_TUF_M5_PID                         0x1898
+#define AURA_ROG_GLADIUS_II_CORE_PID                0x18DD
+#define AURA_ROG_GLADIUS_II_PID                     0x1845
+#define AURA_ROG_GLADIUS_II_ORIGIN_PID              0x1877
+#define AURA_ROG_GLADIUS_II_ORIGIN_PNK_LTD_PID      0x18CD
+#define AURA_ROG_GLADIUS_II_ORIGIN_COD_PID          0x18B1
+#define AURA_ROG_GLADIUS_II_WIRELESS_1_PID          0x189E
+#define AURA_ROG_GLADIUS_II_WIRELESS_2_PID          0x18A0
+#define AURA_ROG_GLADIUS_III_WIRELESS_USB_PID       0x197D
+#define AURA_ROG_GLADIUS_III_WIRELESS_2_4_PID       0x197F
+#define AURA_ROG_GLADIUS_III_WIRELESS_BT_PID        0x1981
+#define AURA_ROG_CHAKRAM_WIRELESS_PID               0x18E5
+#define AURA_ROG_CHAKRAM_WIRED_1_PID                0x18E3
+#define AURA_ROG_CHAKRAM_CORE_PID                   0x1958
+#define AURA_ROG_PUGIO_PID                          0x1846
+#define AURA_ROG_PUGIO_II_WIRED_PID                 0x1906
+#define AURA_ROG_PUGIO_II_WIRELESS_PID              0x1908
+#define AURA_ROG_STRIX_IMPACT_PID                   0x1847
+#define AURA_ROG_STRIX_IMPACT_II_PID                0x18E1
+#define AURA_ROG_STRIX_IMPACT_II_GUNDAM_PID         0x189E
+#define AURA_ROG_STRIX_IMPACT_II_PUNK_PID           0x1956
+#define AURA_ROG_STRIX_IMPACT_II_WHITE_PID          0x19D2
+#define AURA_ROG_STRIX_IMPACT_II_WIRELESS_USB_PID   0x1947
+#define AURA_ROG_STRIX_IMPACT_II_WIRELESS_2_4_PID   0x1949
+#define AURA_ROG_KERIS                              0x195C
+#define AURA_ROG_KERIS_WIRELESS_USB_PID             0x195E
+#define AURA_ROG_KERIS_WIRELESS_2_4_PID             0x1960
+#define AURA_ROG_KERIS_WIRELESS_BT_PID              0x1962
+#define AURA_TUF_M3_PID                             0x1910
+#define AURA_TUF_M5_PID                             0x1898
 
 enum
 {
@@ -57,6 +65,8 @@ typedef struct
 {
     uint8_t                 speed_min;
     uint8_t                 speed_max;
+    uint8_t                 brightness_min;
+    uint8_t                 brightness_max;
     bool                    wireless;
     int                     version_protocol;
     std::vector<uint8_t>    mouse_zones;
@@ -76,10 +86,12 @@ static std::map<int,mouse_type> aura_mouse_devices =
     {
         AURA_ROG_GLADIUS_II_CORE_PID, // ROG Gladius II Core
         {
-            0,    //Speed Min - The Asus Mouse protocol defines larger numbers as slow
-            0,    //Speed Max
-            false,
-            1,
+            0,      // Speed Min - The Asus Mouse protocol defines larger numbers as slow
+            0,      // Speed Max
+            0,      // Brightness Min
+            4,      // Brightness Max
+            false,  // is wireless? (important for fetching the version)
+            1,      // version protocol
             { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL },
             { AURA_MOUSE_MODE_STATIC, AURA_MOUSE_MODE_BREATHING, AURA_MOUSE_MODE_SPECTRUM, AURA_MOUSE_MODE_REACTIVE }
         }
@@ -89,6 +101,8 @@ static std::map<int,mouse_type> aura_mouse_devices =
         {
             255,
             1,
+            0,
+            4,
             false,
             0,
             { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW },
@@ -100,6 +114,8 @@ static std::map<int,mouse_type> aura_mouse_devices =
         {
             255,
             1,
+            0,
+            4,
             false,
             0,
             { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW },
@@ -111,6 +127,8 @@ static std::map<int,mouse_type> aura_mouse_devices =
         {
             255,
             1,
+            0,
+            4,
             false,
             0,
             { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW },
@@ -122,6 +140,8 @@ static std::map<int,mouse_type> aura_mouse_devices =
         {
             255,
             1,
+            0,
+            4,
             false,
             0,
             { AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW },
@@ -133,6 +153,8 @@ static std::map<int,mouse_type> aura_mouse_devices =
         {
             0,
             0,
+            0,
+            4,
             true,
             1,
             { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL },
@@ -144,17 +166,60 @@ static std::map<int,mouse_type> aura_mouse_devices =
         {
             0,
             0,
+            0,
+            4,
             true,
             1,
             { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL },
             { AURA_MOUSE_MODE_STATIC, AURA_MOUSE_MODE_BREATHING, AURA_MOUSE_MODE_SPECTRUM, AURA_MOUSE_MODE_NONE, AURA_MOUSE_MODE_REACTIVE, AURA_MOUSE_MODE_NONE, AURA_MOUSE_MODE_BATTERY }
         }
     },
+    {
+        AURA_ROG_GLADIUS_III_WIRELESS_USB_PID, // ROG Gladius III Wireless USB
+        {
+            255,
+            1,
+            0,
+            64,
+            false,
+            1,
+            { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW },
+            { AURA_MOUSE_MODE_STATIC, AURA_MOUSE_MODE_BREATHING, AURA_MOUSE_MODE_SPECTRUM, AURA_MOUSE_MODE_WAVE, AURA_MOUSE_MODE_REACTIVE, AURA_MOUSE_MODE_COMET, AURA_MOUSE_MODE_BATTERY }
+        }
+    },
+    {
+        AURA_ROG_GLADIUS_III_WIRELESS_2_4_PID, // ROG Gladius III Wireless 2.4 GHz Dongle
+        {
+            255,
+            1,
+            0,
+            64,
+            true,
+            1,
+            { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW },
+            { AURA_MOUSE_MODE_STATIC, AURA_MOUSE_MODE_BREATHING, AURA_MOUSE_MODE_SPECTRUM, AURA_MOUSE_MODE_WAVE, AURA_MOUSE_MODE_REACTIVE, AURA_MOUSE_MODE_COMET, AURA_MOUSE_MODE_BATTERY }
+        }
+    },
+    {
+        AURA_ROG_GLADIUS_III_WIRELESS_BT_PID, // ROG Gladius III Wireless Bluetooth
+        {
+            255,
+            1,
+            0,
+            64,
+            true,
+            1,
+            { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW },
+            { AURA_MOUSE_MODE_STATIC, AURA_MOUSE_MODE_BREATHING, AURA_MOUSE_MODE_SPECTRUM, AURA_MOUSE_MODE_WAVE, AURA_MOUSE_MODE_REACTIVE, AURA_MOUSE_MODE_COMET, AURA_MOUSE_MODE_BATTERY }
+        }
+    },
     {
         AURA_ROG_CHAKRAM_WIRELESS_PID, // ROG Chakram Wireless
         {
             15,
             1,
+            0,
+            4,
             true,
             1,
             { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW },
@@ -166,6 +231,8 @@ static std::map<int,mouse_type> aura_mouse_devices =
         {
             15,
             1,
+            0,
+            4,
             false,
             1,
             { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW },
@@ -177,6 +244,8 @@ static std::map<int,mouse_type> aura_mouse_devices =
         {
             0,
             0,
+            0,
+            4,
             false,
             1,
             { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL },
@@ -188,6 +257,8 @@ static std::map<int,mouse_type> aura_mouse_devices =
         {
             255,
             1,
+            0,
+            4,
             false,
             0,
             { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW },
@@ -199,6 +270,8 @@ static std::map<int,mouse_type> aura_mouse_devices =
         {
             15,
             1,
+            0,
+            4,
             false,
             1,
             { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW },
@@ -210,6 +283,8 @@ static std::map<int,mouse_type> aura_mouse_devices =
         {
             15,
             1,
+            0,
+            4,
             true,
             1,
             { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW },
@@ -221,6 +296,8 @@ static std::map<int,mouse_type> aura_mouse_devices =
         {
             0,
             0,
+            0,
+            4,
             false,
             3,
             { AURA_MOUSE_ZONE_LOGO },
@@ -232,17 +309,86 @@ static std::map<int,mouse_type> aura_mouse_devices =
         {
             0,
             0,
+            0,
+            4,
             false,
             1,
             { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW },
             { AURA_MOUSE_MODE_STATIC, AURA_MOUSE_MODE_BREATHING, AURA_MOUSE_MODE_SPECTRUM, AURA_MOUSE_MODE_REACTIVE }
         }
     },
+    {
+        AURA_ROG_STRIX_IMPACT_II_GUNDAM_PID, // ROG Strix Impact II Gundam
+        {
+            0,
+            0,
+            0,
+            4,
+            false,
+            1,
+            { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW },
+            { AURA_MOUSE_MODE_STATIC, AURA_MOUSE_MODE_BREATHING, AURA_MOUSE_MODE_SPECTRUM, AURA_MOUSE_MODE_REACTIVE }
+        }
+    },
+    {
+        AURA_ROG_STRIX_IMPACT_II_PUNK_PID, // ROG Strix Impact II Electro Punk
+        {
+            0,
+            0,
+            0,
+            4,
+            false,
+            1,
+            { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW },
+            { AURA_MOUSE_MODE_STATIC, AURA_MOUSE_MODE_BREATHING, AURA_MOUSE_MODE_SPECTRUM, AURA_MOUSE_MODE_REACTIVE }
+        }
+    },
+    {
+        AURA_ROG_STRIX_IMPACT_II_WHITE_PID, // ROG Strix Impact II Moonlight White
+        {
+            0,
+            0,
+            0,
+            4,
+            false,
+            1,
+            { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW },
+            { AURA_MOUSE_MODE_STATIC, AURA_MOUSE_MODE_BREATHING, AURA_MOUSE_MODE_SPECTRUM, AURA_MOUSE_MODE_REACTIVE }
+        }
+    },
+    {
+        AURA_ROG_STRIX_IMPACT_II_WIRELESS_USB_PID, // ROG Strix Impact II Wireless USB
+        {
+            0,
+            0,
+            0,
+            4,
+            false,
+            1, // not tested, but likely same as ROG Strix Impact II non wireless
+            { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL },
+            { AURA_MOUSE_MODE_STATIC, AURA_MOUSE_MODE_BREATHING, AURA_MOUSE_MODE_SPECTRUM, AURA_MOUSE_MODE_REACTIVE, AURA_MOUSE_MODE_NONE, AURA_MOUSE_MODE_NONE, AURA_MOUSE_MODE_BATTERY }
+        }
+    },
+    {
+        AURA_ROG_STRIX_IMPACT_II_WIRELESS_2_4_PID, // ROG Strix Impact II Wireless 2.4 GHz Dongle
+        {
+            0,
+            0,
+            0,
+            4,
+            true,
+            1, // not tested, but likely same as ROG Strix Impact II non wireless
+            { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL },
+            { AURA_MOUSE_MODE_STATIC, AURA_MOUSE_MODE_BREATHING, AURA_MOUSE_MODE_SPECTRUM, AURA_MOUSE_MODE_REACTIVE, AURA_MOUSE_MODE_NONE, AURA_MOUSE_MODE_NONE, AURA_MOUSE_MODE_BATTERY }
+        }
+    },
     {
         AURA_ROG_KERIS, // ROG Keris
         {
             0,
             0,
+            0,
+            4,
             false,
             1, // might be the wrong protocol for version
             { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL },
@@ -254,6 +400,8 @@ static std::map<int,mouse_type> aura_mouse_devices =
         {
             0,
             0,
+            0,
+            4,
             true,
             1, // might be the wrong protocol for version
             { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL },
@@ -265,6 +413,8 @@ static std::map<int,mouse_type> aura_mouse_devices =
         {
             0,
             0,
+            0,
+            4,
             true,
             1, // might be the wrong protocol for version
             { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL },
@@ -276,6 +426,8 @@ static std::map<int,mouse_type> aura_mouse_devices =
         {
             0,
             0,
+            0,
+            4,
             true,
             1, // might be the wrong protocol for version
             { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL },
@@ -287,6 +439,8 @@ static std::map<int,mouse_type> aura_mouse_devices =
         {
             0,
             0,
+            0,
+            4,
             false,
             1,
             { AURA_MOUSE_ZONE_LOGO },
@@ -298,6 +452,8 @@ static std::map<int,mouse_type> aura_mouse_devices =
         {
             0,
             0,
+            0,
+            4,
             false,
             2,
             { AURA_MOUSE_ZONE_LOGO },

Controllers/AsusAuraUSBController/AsusAuraMousematController.cpp

@@ -110,7 +110,7 @@ void AuraMousematController::UpdateDevice
     usb_buf[0x08]   = pattern;
     usb_buf[0x09]   = 0x00;
 
-    for(int i = 0; i < colors.size(); i++)
+    for(unsigned int i = 0; i < colors.size(); i++)
     {
         usb_buf[0x0a + i * 3]   = RGBGetRValue(colors[i]);
         usb_buf[0x0b + i * 3]   = RGBGetGValue(colors[i]);

Controllers/AsusAuraUSBController/AsusAuraRyuoAIOController.cpp

@@ -0,0 +1,118 @@
+/*-------------------------------------------------------------------*\
+|  AsusAuraRyuoAIOController.cpp                                      |
+|                                                                     |
+|  Driver for the ASUS Aura Ryuo AIO                                  |
+|    lighting controller                                              |
+|                                                                     |
+|  Cooper Hall (geobot19 / Geo_bot)          08 Apr 2022              |
+|  using snipets from Chris M (Dr.No)                                 |
+\*-------------------------------------------------------------------*/
+
+#include "AsusAuraRyuoAIOController.h"
+
+AsusAuraRyuoAIOController::AsusAuraRyuoAIOController(hid_device* dev_handle, const char* path) : AuraUSBController(dev_handle, path)
+{
+	/*-----------------------------------------------------*\
+	| Add addressable devices                               |
+	|    Manually adding device info for now                |
+	|    TODO: Implement config table accurately            |
+	\*-----------------------------------------------------*/
+	device_info.push_back({0x00, 0x00, 12, 0, AuraDeviceType::FIXED});
+}
+
+AsusAuraRyuoAIOController::~AsusAuraRyuoAIOController()
+{
+	hid_close(dev);
+}
+
+std::string AsusAuraRyuoAIOController::GetLocation()
+{
+	return("HID: " + location);
+}
+
+void AsusAuraRyuoAIOController::SetMode(unsigned char /*channel*/, unsigned char /*mode*/, unsigned char /*red*/, unsigned char /*grn*/, unsigned char /*blu*/)
+{
+	/*---------------------------------------------------------*\
+	| This interface is not used in this controller however is  |
+	|   required by the abstract class                          |
+	\*---------------------------------------------------------*/
+}
+
+void AsusAuraRyuoAIOController::SetMode(unsigned char mode, unsigned char speed, unsigned char direction, RGBColor colour)
+{
+	//check if update is needed
+	if(!((current_mode == mode) && (ToRGBColor(current_red, current_green, current_blue) == colour) && (current_speed == speed) && (current_direction == direction)))
+	{
+		current_mode        = mode;
+		current_speed       = speed;
+		current_direction   = direction;
+		current_red         = RGBGetRValue(colour);
+		current_green       = RGBGetGValue(colour);
+		current_blue        = RGBGetBValue(colour);
+		SendUpdate();
+	}
+}
+
+void AsusAuraRyuoAIOController::SetChannelLEDs(unsigned char /*channel*/, RGBColor* /*colors*/, unsigned int /*num_colors*/)
+{
+	/*---------------------------------------------------------*\
+	| This interface is not used in this controller however is  |
+	|   required by the abstract class                          |
+	\*---------------------------------------------------------*/
+}
+
+void AsusAuraRyuoAIOController::SetLedsDirect(RGBColor * led_colours, uint8_t led_count)
+{
+	uint8_t buffer[write_packet_size]   = { 0xEC, 0x40, 0x80, 0x00, led_count };
+
+	/*---------------------------------------------------------*\
+	| Set the colour bytes in the packet                        |
+	\*---------------------------------------------------------*/
+	for(uint8_t index = 0; index < led_count; index++)
+	{
+		uint8_t offset      = (index * 3) + RED_BYTE;
+
+		buffer[offset + 0]  = RGBGetRValue(led_colours[index]);
+		buffer[offset + 1]  = RGBGetGValue(led_colours[index]);
+		buffer[offset + 2]  = RGBGetBValue(led_colours[index]);
+	}
+
+	hid_write(dev, buffer, write_packet_size);
+}
+
+void AsusAuraRyuoAIOController::GetStatus()
+{
+	uint8_t buffer[write_packet_size]   = { 0xEC, 0x01, 0x02 };
+
+	hid_write(dev, buffer, write_packet_size);
+	hid_read_timeout(dev, buffer, read_packet_size, ASUSAURARYUOAIOCONTROLLER_TIMEOUT);
+
+	current_red   = buffer[RED_BYTE - 1];
+	current_green = buffer[GREEN_BYTE - 1];
+	current_blue  = buffer[BLUE_BYTE - 1];
+}
+
+void AsusAuraRyuoAIOController::SendUpdate()
+{
+	uint8_t buffer[write_packet_size];
+
+	/*-----------------------------------------------------*\
+	| Zero out buffer                                       |
+	\*-----------------------------------------------------*/
+	memset(buffer, 0x00, write_packet_size);
+
+	buffer[REPORTID_BYTE] = reportid;
+	buffer[COMMAND_BYTE]  = modefx;
+	buffer[ZONE_BYTE]     = 0;
+	buffer[PROGRAM_ID_BYTE]  = program_id;
+	buffer[MODE_BYTE]     = current_mode;
+	buffer[RED_BYTE]      = current_red;
+	buffer[GREEN_BYTE]    = current_green;
+	buffer[BLUE_BYTE]     = current_blue;
+
+	buffer[DIRECTION_BYTE]= current_direction;
+	buffer[SPEED_BYTE]    = current_speed;
+
+	hid_write(dev, buffer, write_packet_size);
+}
+

Controllers/AsusAuraUSBController/AsusAuraRyuoAIOController.h

@@ -0,0 +1,94 @@
+/*-------------------------------------------------------------------*\
+|  AsusAuraRyuoAIOController.h                                        |
+|                                                                     |
+|  Driver for the ASUS Aura Ryuo AIO                                  |
+|    lighting controller                                              |
+|                                                                     |
+|  Cooper Hall (geobot19 / Geo_bot)          08 Apr 2022              |
+|  using snipets from Chris M (Dr.No)                                 |
+\*-------------------------------------------------------------------*/
+
+#include <string>
+#include <hidapi/hidapi.h>
+#include "RGBController.h"
+#include "AsusAuraUSBController.h"
+
+#pragma once
+
+#define ASUSAURARYUOAIOCONTROLLER_TIMEOUT        250
+#define ASUSAURARYUOAIOCONTROLLER_HID_MAX_STR    255
+
+#define ASUSAURARYUOAIOCONTROLLER_BRIGHTNESS_MIN 0
+#define ASUSAURARYUOAIOCONTROLLER_BRIGHTNESS_MAX 255
+
+class AsusAuraRyuoAIOController : public AuraUSBController
+{
+public:
+    enum
+    {
+        MODE_DIRECT       = 0xFF, //Direct Led Control - Independently set LEDs in zone
+        MODE_STATIC       = 0x01, //Static Mode - Set entire zone to a single color.
+        MODE_BREATHING    = 0x02, //Breathing Mode - Fades between fully off and fully on.
+        MODE_FLASHING     = 0x03, //Flashing Mode - Abruptly changing between fully off and fully on.
+        MODE_SPECTRUM     = 0x04, //Spectrum Cycle Mode - Cycles through the color spectrum on all lights on the device
+        MODE_RAINBOW      = 0x05, //Rainbow Wave Mode - Cycle thru the color spectrum as a wave across all LEDs
+        MODE_FLASHANDDASH = 0x0A, //Flash n Dash - Flash twice and then flash in direction
+    };
+
+    enum PacketMap
+    {
+        REPORTID_BYTE  = 0,
+        COMMAND_BYTE   = 1,
+        ZONE_BYTE      = 2,
+        PROGRAM_ID_BYTE= 3,
+        MODE_BYTE      = 4,
+        RED_BYTE       = 5,
+        GREEN_BYTE     = 6,
+        BLUE_BYTE      = 7,
+        DIRECTION_BYTE = 8,
+        SPEED_BYTE     = 9,
+    };
+
+    enum
+    {
+        SPEED_SLOWEST     = 0x04, // Slowest speed
+        SPEED_SLOW        = 0x03, // Slower speed
+        SPEED_NORMAL      = 0x02, // Normal speed
+        SPEED_FAST        = 0x01, // Fast speed
+        SPEED_FASTEST     = 0x00, // Fastest speed
+    };
+
+    AsusAuraRyuoAIOController(hid_device* dev_handle, const char* path);
+    ~AsusAuraRyuoAIOController();
+
+    std::string             GetLocation();
+
+    void                    SetChannelLEDs(unsigned char channel, RGBColor *colors, unsigned int num_colors);
+    void                    SetLedsDirect(RGBColor * led_colours, uint8_t led_count);
+
+    void                    SetMode(unsigned char channel, unsigned char mode, unsigned char red, unsigned char grn, unsigned char blu);
+    void                    SetMode(unsigned char mode, unsigned char speed, unsigned char direction, RGBColor colour);
+private:
+    static const uint8_t    read_packet_size    = 65;
+    static const uint8_t    write_packet_size   = 65;
+    static const uint8_t    modefx   = 0x3B;
+    static const uint8_t    direct   = 0x40;
+    static const uint8_t    reportid = 0xEC;
+    static const uint8_t    program_id = 0x22;
+
+    std::string             location;
+
+    uint8_t                 zone_index;
+    uint8_t                 current_mode;
+    uint8_t                 current_speed;
+
+    uint8_t                 current_red;
+    uint8_t                 current_green;
+    uint8_t                 current_blue;
+    uint8_t                 current_direction;
+
+    void                    GetStatus();
+    void                    SendUpdate();
+    void                    SendEffect(unsigned char channel, unsigned char mode, unsigned char red, unsigned char grn, unsigned char blu);
+    void                    SendDirectApply(unsigned char channel);
+};

Controllers/AsusAuraUSBController/AsusAuraUSBController.cpp

@@ -26,6 +26,7 @@ AuraUSBController::~AuraUSBController()
 {
     hid_close(dev);
 }
+
 unsigned int AuraUSBController::GetChannelCount()
 {
     return(device_info.size());
@@ -104,7 +105,7 @@ void AuraUSBController::GetConfigTable()
         }
     }
     else
-    {       
+    {
         LOG_INFO("[%s] Could not read config table, can not add device", device_name);
         delete this;
     }

Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp

@@ -8,6 +8,7 @@
 #include "AsusAuraMousematController.h"
 #include "AsusAuraStrixEvolveController.h"
 #include "AsusAuraMonitorController.h"
+#include "AsusAuraRyuoAIOController.h"
 #include "RGBController.h"
 #include "RGBController_AsusAuraUSB.h"
 #include "RGBController_AsusAuraHeadsetStand.h"
@@ -18,6 +19,7 @@
 #include "RGBController_ROGStrixLC_Controller.h"
 #include "RGBController_AsusAuraStrixEvolve.h"
 #include "RGBController_AsusAuraMonitor.h"
+#include "RGBController_AsusAuraRyuoAIO.h"
 #include <stdexcept>
 #include <hidapi/hidapi.h>
 #include "dependencies/dmiinfo.h"
@@ -65,6 +67,8 @@
 \*-----------------------------------------------------------------*/
 
 #define AURA_ROG_STRIX_XG27AQ_PID               0x198C
+#define AURA_ROG_STRIX_XG27W_PID                0x1933
+#define AURA_ROG_PG32UQ_PID                     0x19B9
 
 /*-----------------------------------------------------------------*\
 | HEADSETSTANDS                                                     |
@@ -79,6 +83,7 @@
 \*-----------------------------------------------------------------*/
 #define AURA_TERMINAL_PID                       0x1889
 #define ROG_STRIX_LC120_PID                     0x879E
+#define AURA_RYUO_AIO_PID                       0x1887
 
 AuraKeyboardMappingLayoutType GetKeyboardMappingLayoutType(int pid)
 {
@@ -208,6 +213,19 @@ void DetectAsusAuraUSBROGStrixLC(hid_device_info* info, const std::string& name)
     }
 }
 
+void DetectAsusAuraUSBRyuoAIO(hid_device_info* info, const std::string& name)
+{
+    hid_device* dev = hid_open_path(info->path);
+
+    if(dev)
+    {
+        AsusAuraRyuoAIOController* controller         = new AsusAuraRyuoAIOController(dev, info->path);
+        RGBController_AsusAuraRyuoAIO* rgb_controller = new RGBController_AsusAuraRyuoAIO(controller);
+        rgb_controller->name                          = name;
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
+    }
+}
+
 void DetectAsusAuraUSBStrixEvolve(hid_device_info* info, const std::string& name)
 {
     hid_device* dev = hid_open_path(info->path);
@@ -253,7 +271,7 @@ void DetectAsusAuraUSBMonitor(hid_device_info* info, const std::string& name)
 
     if(dev)
     {
-        AuraMonitorController*     controller           = new AuraMonitorController(dev, info->path);
+        AuraMonitorController*     controller           = new AuraMonitorController(dev, info->path, info->product_id);
         RGBController_AuraMonitor* rgb_controller       = new RGBController_AuraMonitor(controller);
         rgb_controller->name                            = name;
         ResourceManager::get()->RegisterRGBController(rgb_controller);
@@ -263,70 +281,81 @@ void DetectAsusAuraUSBMonitor(hid_device_info* info, const std::string& name)
 /*-----------------------------------------------------------------*\
 |  MOTHERBOARDS                                                     |
 \*-----------------------------------------------------------------*/
-REGISTER_HID_DETECTOR   ("ASUS Aura Addressable",               DetectAsusAuraUSBAddressable,   AURA_USB_VID, AURA_ADDRESSABLE_1_PID);
-REGISTER_HID_DETECTOR   ("ASUS Aura Addressable",               DetectAsusAuraUSBAddressable,   AURA_USB_VID, AURA_ADDRESSABLE_2_PID);
-REGISTER_HID_DETECTOR   ("ASUS Aura Addressable",               DetectAsusAuraUSBAddressable,   AURA_USB_VID, AURA_ADDRESSABLE_3_PID);
-REGISTER_HID_DETECTOR   ("ASUS Aura Addressable",               DetectAsusAuraUSBAddressable,   AURA_USB_VID, AURA_ADDRESSABLE_4_PID);
-REGISTER_HID_DETECTOR   ("ASUS Aura Motherboard",               DetectAsusAuraUSBMotherboards,  AURA_USB_VID, AURA_MOTHERBOARD_1_PID);
-REGISTER_HID_DETECTOR   ("ASUS Aura Motherboard",               DetectAsusAuraUSBMotherboards,  AURA_USB_VID, AURA_MOTHERBOARD_2_PID);
-REGISTER_HID_DETECTOR   ("ASUS Aura Motherboard",               DetectAsusAuraUSBMotherboards,  AURA_USB_VID, AURA_MOTHERBOARD_3_PID);
+REGISTER_HID_DETECTOR   ("ASUS Aura Addressable",                       DetectAsusAuraUSBAddressable,   AURA_USB_VID, AURA_ADDRESSABLE_1_PID);
+REGISTER_HID_DETECTOR   ("ASUS Aura Addressable",                       DetectAsusAuraUSBAddressable,   AURA_USB_VID, AURA_ADDRESSABLE_2_PID);
+REGISTER_HID_DETECTOR   ("ASUS Aura Addressable",                       DetectAsusAuraUSBAddressable,   AURA_USB_VID, AURA_ADDRESSABLE_3_PID);
+REGISTER_HID_DETECTOR   ("ASUS Aura Addressable",                       DetectAsusAuraUSBAddressable,   AURA_USB_VID, AURA_ADDRESSABLE_4_PID);
+REGISTER_HID_DETECTOR   ("ASUS Aura Motherboard",                       DetectAsusAuraUSBMotherboards,  AURA_USB_VID, AURA_MOTHERBOARD_1_PID);
+REGISTER_HID_DETECTOR   ("ASUS Aura Motherboard",                       DetectAsusAuraUSBMotherboards,  AURA_USB_VID, AURA_MOTHERBOARD_2_PID);
+REGISTER_HID_DETECTOR   ("ASUS Aura Motherboard",                       DetectAsusAuraUSBMotherboards,  AURA_USB_VID, AURA_MOTHERBOARD_3_PID);
 
 /*-----------------------------------------------------------------*\
 |  KEYBOARDS                                                        |
 \*-----------------------------------------------------------------*/
-REGISTER_HID_DETECTOR_IP("ASUS ROG Falchion (Wired)",           DetectAsusAuraUSBKeyboards,     AURA_USB_VID, AURA_ROG_FALCHION_WIRED_PID,              1,  0xFF00);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Falchion (Wireless)",        DetectAsusAuraUSBKeyboards,     AURA_USB_VID, AURA_ROG_FALCHION_WIRELESS_PID,           1,  0xFF00);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Flare",                DetectAsusAuraUSBKeyboards,     AURA_USB_VID, AURA_ROG_STRIX_FLARE_PID,                 1,  0xFF00);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Flare PNK LTD",        DetectAsusAuraUSBKeyboards,     AURA_USB_VID, AURA_ROG_STRIX_FLARE_PNK_LTD_PID,         1,  0xFF00);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope",                DetectAsusAuraUSBKeyboards,     AURA_USB_VID, AURA_ROG_STRIX_SCOPE_PID,                 1,  0xFF00);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope RX",             DetectAsusAuraUSBKeyboards,     AURA_USB_VID, AURA_ROG_STRIX_SCOPE_RX_PID,              1,  0xFF00);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope TKL",            DetectAsusAuraUSBKeyboards,     AURA_USB_VID, AURA_ROG_STRIX_SCOPE_TKL_PID,             1,  0xFF00);
-REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming K7",                  DetectAsusAuraTUFUSBKeyboard,   AURA_USB_VID, AURA_TUF_K7_GAMING_PID,                   1,  0xFF00);
-REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming K3",                  DetectAsusAuraTUFUSBKeyboard,   AURA_USB_VID, AURA_TUF_K3_GAMING_PID,                   1,  0xFF00);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Falchion (Wired)",                   DetectAsusAuraUSBKeyboards,     AURA_USB_VID, AURA_ROG_FALCHION_WIRED_PID,                  1,  0xFF00);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Falchion (Wireless)",                DetectAsusAuraUSBKeyboards,     AURA_USB_VID, AURA_ROG_FALCHION_WIRELESS_PID,               1,  0xFF00);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Flare",                        DetectAsusAuraUSBKeyboards,     AURA_USB_VID, AURA_ROG_STRIX_FLARE_PID,                     1,  0xFF00);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Flare PNK LTD",                DetectAsusAuraUSBKeyboards,     AURA_USB_VID, AURA_ROG_STRIX_FLARE_PNK_LTD_PID,             1,  0xFF00);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope",                        DetectAsusAuraUSBKeyboards,     AURA_USB_VID, AURA_ROG_STRIX_SCOPE_PID,                     1,  0xFF00);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope RX",                     DetectAsusAuraUSBKeyboards,     AURA_USB_VID, AURA_ROG_STRIX_SCOPE_RX_PID,                  1,  0xFF00);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope TKL",                    DetectAsusAuraUSBKeyboards,     AURA_USB_VID, AURA_ROG_STRIX_SCOPE_TKL_PID,                 1,  0xFF00);
+REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming K7",                          DetectAsusAuraTUFUSBKeyboard,   AURA_USB_VID, AURA_TUF_K7_GAMING_PID,                       1,  0xFF00);
+REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming K3",                          DetectAsusAuraTUFUSBKeyboard,   AURA_USB_VID, AURA_TUF_K3_GAMING_PID,                       1,  0xFF00);
 
 /*-----------------------------------------------------------------*\
 |  MICE                                                             |
 \*-----------------------------------------------------------------*/
-REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Core",            DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_GLADIUS_II_CORE_PID,             0,  0xFF01);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II",                 DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_GLADIUS_II_PID,                  2,  0xFF01);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Origin",          DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_GLADIUS_II_ORIGIN_PID,           2,  0xFF01);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Origin PNK LTD",  DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_GLADIUS_II_ORIGIN_PNK_LTD_PID,   2,  0xFF01);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Origin COD",      DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_GLADIUS_II_ORIGIN_COD_PID,       2,  0xFF01);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Wireless",        DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_GLADIUS_II_WIRELESS_1_PID,       1,  0xFF13);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Wireless",        DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_GLADIUS_II_WIRELESS_2_PID,       2,  0xFF01);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Chakram (Wireless)",         DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_CHAKRAM_WIRELESS_PID,            0,  0xFF01);
-REGISTER_HID_DETECTOR_IP("Asus ROG Chakram (Wired)",            DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_CHAKRAM_WIRED_1_PID,             0,  0xFF01);
-REGISTER_HID_DETECTOR_IP("Asus ROG Chakram Core",               DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_CHAKRAM_CORE_PID,                0,  0xFF01);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Pugio",                      DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_PUGIO_PID,                       2,  0xFF01);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Pugio II (Wired)",           DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_PUGIO_II_WIRED_PID,              0,  0xFF01);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Pugio II (Wireless)",        DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_PUGIO_II_WIRELESS_PID,           0,  0xFF01);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Impact",               DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_STRIX_IMPACT_PID,                0,  0xFF01);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Impact II",            DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_STRIX_IMPACT_II_PID,             0,  0xFF01);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Keris",                      DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_KERIS,                           0,  0xFF01);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Keris Wireless USB",         DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_KERIS_WIRELESS_USB_PID,          0,  0xFF01);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Keris Wireless 2.4Ghz",      DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_KERIS_WIRELESS_2_4_PID,          0,  0xFF01);
-REGISTER_HID_DETECTOR_IP("ASUS ROG Keris Wireless Bluetooth",   DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_KERIS_WIRELESS_BT_PID,           0,  0xFF01);
-REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming M3",                  DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_TUF_M3_PID,                          1,  0xFF01);
-REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming M5",                  DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_TUF_M5_PID,                          2,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Core",                    DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_GLADIUS_II_CORE_PID,                 0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II",                         DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_GLADIUS_II_PID,                      2,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Origin",                  DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_GLADIUS_II_ORIGIN_PID,               2,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Origin PNK LTD",          DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_GLADIUS_II_ORIGIN_PNK_LTD_PID,       2,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Origin COD",              DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_GLADIUS_II_ORIGIN_COD_PID,           2,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Wireless",                DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_GLADIUS_II_WIRELESS_1_PID,           1,  0xFF13);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Wireless",                DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_GLADIUS_II_WIRELESS_2_PID,           2,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius III Wireless USB",           DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_GLADIUS_III_WIRELESS_USB_PID,        0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius III Wireless 2.4Ghz",        DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_GLADIUS_III_WIRELESS_2_4_PID,        0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius III Wireless Bluetooth",     DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_GLADIUS_III_WIRELESS_BT_PID,         0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Chakram (Wireless)",                 DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_CHAKRAM_WIRELESS_PID,                0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("Asus ROG Chakram (Wired)",                    DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_CHAKRAM_WIRED_1_PID,                 0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("Asus ROG Chakram Core",                       DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_CHAKRAM_CORE_PID,                    0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Pugio",                              DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_PUGIO_PID,                           2,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Pugio II (Wired)",                   DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_PUGIO_II_WIRED_PID,                  0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Pugio II (Wireless)",                DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_PUGIO_II_WIRELESS_PID,               0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Impact",                       DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_STRIX_IMPACT_PID,                    0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Impact II",                    DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_STRIX_IMPACT_II_PID,                 0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Impact II Gundam",             DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_STRIX_IMPACT_II_GUNDAM_PID,          0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Impact II Electro Punk",       DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_STRIX_IMPACT_II_PUNK_PID,            0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Impact II Moonlight White",    DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_STRIX_IMPACT_II_WHITE_PID,           0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Impact II Wireless USB",       DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_STRIX_IMPACT_II_WIRELESS_USB_PID,    0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Impact II Wireless 2.4 Ghz",   DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_STRIX_IMPACT_II_WIRELESS_2_4_PID,    0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Keris",                              DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_KERIS,                               0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Keris Wireless USB",                 DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_KERIS_WIRELESS_USB_PID,              0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Keris Wireless 2.4Ghz",              DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_KERIS_WIRELESS_2_4_PID,              0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Keris Wireless Bluetooth",           DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_ROG_KERIS_WIRELESS_BT_PID,               0,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming M3",                          DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_TUF_M3_PID,                              1,  0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming M5",                          DetectAsusAuraUSBMice,          AURA_USB_VID, AURA_TUF_M5_PID,                              2,  0xFF01);
 
-REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Evolve",               DetectAsusAuraUSBStrixEvolve,   AURA_USB_VID, AURA_ROG_STRIX_EVOLVE_PID,                1,  0x0008);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Evolve",                       DetectAsusAuraUSBStrixEvolve,   AURA_USB_VID, AURA_ROG_STRIX_EVOLVE_PID,                    1,  0x0008);
 
 /*-----------------------------------------------------------------*\
 | MOUSEMATS                                                         |
 \*-----------------------------------------------------------------*/
-REGISTER_HID_DETECTOR_PU("ASUS ROG Balteus",                    DetectAsusAuraUSBMousemats,     AURA_USB_VID, AURA_ROG_BALTEUS_PID,                     0xFF06, 1);
-REGISTER_HID_DETECTOR_PU("ASUS ROG Balteus Qi",                 DetectAsusAuraUSBMousemats,     AURA_USB_VID, AURA_ROG_BALTEUS_QI_PID,                  0xFF06, 1);
+REGISTER_HID_DETECTOR_PU("ASUS ROG Balteus",                            DetectAsusAuraUSBMousemats,     AURA_USB_VID, AURA_ROG_BALTEUS_PID,                         0xFF06, 1);
+REGISTER_HID_DETECTOR_PU("ASUS ROG Balteus Qi",                         DetectAsusAuraUSBMousemats,     AURA_USB_VID, AURA_ROG_BALTEUS_QI_PID,                      0xFF06, 1);
 
 /*-----------------------------------------------------------------*\
 | MONITORS                                                          |
 \*-----------------------------------------------------------------*/
-REGISTER_HID_DETECTOR_PU("ASUS ROG Strix XG27AQ",               DetectAsusAuraUSBMonitor,       AURA_USB_VID, AURA_ROG_STRIX_XG27AQ_PID,                0xFFA0, 1);
+REGISTER_HID_DETECTOR_PU("ASUS ROG Strix XG27AQ",                       DetectAsusAuraUSBMonitor,       AURA_USB_VID, AURA_ROG_STRIX_XG27AQ_PID,                    0xFFA0, 1);
+REGISTER_HID_DETECTOR_PU("ASUS ROG Strix XG27W",                        DetectAsusAuraUSBMonitor,       AURA_USB_VID, AURA_ROG_STRIX_XG27W_PID,                     0xFFA0, 1);
+REGISTER_HID_DETECTOR_PU("ASUS ROG PG32UQ",                             DetectAsusAuraUSBMonitor,       AURA_USB_VID, AURA_ROG_PG32UQ_PID,                          0xFFA0, 1);
 
 /*-----------------------------------------------------------------*\
 |  OTHER                                                            |
 \*-----------------------------------------------------------------*/
-REGISTER_HID_DETECTOR    ("ASUS ROG AURA Terminal",             DetectAsusAuraUSBTerminal,      AURA_USB_VID, AURA_TERMINAL_PID);
-REGISTER_HID_DETECTOR_PU ("ASUS ROG Strix LC",                  DetectAsusAuraUSBROGStrixLC,    AURA_USB_VID, ROG_STRIX_LC120_PID,                      0x00FF, 1);
-REGISTER_HID_DETECTOR_I  ("ASUS ROG Throne",                    DetectAsusAuraUSBHeadsetStand,  AURA_USB_VID, AURA_ROG_THRONE_PID,                      0);
-REGISTER_HID_DETECTOR_I  ("ASUS ROG Throne QI",                 DetectAsusAuraUSBHeadsetStand,  AURA_USB_VID, AURA_ROG_THRONE_QI_PID,                   0);
-REGISTER_HID_DETECTOR_I  ("ASUS ROG Throne QI GUNDAM",          DetectAsusAuraUSBHeadsetStand,  AURA_USB_VID, AURA_ROG_THRONE_QI_GUNDAM_PID,            0);
+REGISTER_HID_DETECTOR    ("ASUS ROG AURA Terminal",                     DetectAsusAuraUSBTerminal,      AURA_USB_VID, AURA_TERMINAL_PID);
+REGISTER_HID_DETECTOR_PU ("ASUS ROG Strix LC",                          DetectAsusAuraUSBROGStrixLC,    AURA_USB_VID, ROG_STRIX_LC120_PID,                          0x00FF, 1);
+REGISTER_HID_DETECTOR_PU ("ASUS ROG Ryuo AIO",                          DetectAsusAuraUSBRyuoAIO,       AURA_USB_VID, AURA_RYUO_AIO_PID,                        0xFF72, 0x00A1);
+REGISTER_HID_DETECTOR_I  ("ASUS ROG Throne",                            DetectAsusAuraUSBHeadsetStand,  AURA_USB_VID, AURA_ROG_THRONE_PID,                          0);
+REGISTER_HID_DETECTOR_I  ("ASUS ROG Throne QI",                         DetectAsusAuraUSBHeadsetStand,  AURA_USB_VID, AURA_ROG_THRONE_QI_PID,                       0);
+REGISTER_HID_DETECTOR_I  ("ASUS ROG Throne QI GUNDAM",                  DetectAsusAuraUSBHeadsetStand,  AURA_USB_VID, AURA_ROG_THRONE_QI_GUNDAM_PID,                0);

Controllers/AsusAuraUSBController/RGBController_AsusAuraHeadsetStand.cpp

@@ -11,6 +11,7 @@
 
 /**------------------------------------------------------------------*\
     @name Asus Aura Headset Stand
+    @category HeadsetStand
     @type USB
     @save :white_check_mark:
     @direct :white_check_mark:
@@ -176,12 +177,6 @@ void RGBController_AuraHeadsetStand::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_AuraHeadsetStand::SetCustomMode()
-{
-    active_mode = 0;
-}
-
-
 void RGBController_AuraHeadsetStand::DeviceUpdateMode()
 {
     unsigned char red = 0;

Controllers/AsusAuraUSBController/RGBController_AsusAuraHeadsetStand.h

@@ -35,7 +35,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
     void        DeviceSaveMode();
 

Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp

@@ -40,7 +40,7 @@ static unsigned int scope_tkl_matrix_map[6][18] =
 static unsigned int falchion_matrix_map[5][16] =
     { {   0,   5,   9,  14,  18,  22,  26,  31,  35,  39,  44,  49,  54,  58,  NA,  63 },
       {   1,  NA,   6,  10,  15,  19,  23,  27,  32,  36,  40,  45,  50,  55,  59,  64 },
-      {   2,  NA,   7,  11,  16,  20,  24,  28,  33,  37,  41,  46,  51,  60,  NA,  65 }, 
+      {   2,  NA,   7,  11,  16,  20,  24,  28,  33,  37,  41,  46,  51,  60,  NA,  65 },
       {   3,  NA,  12,  17,  21,  25,  29,  34,  38,  42,  47,  52,  56,  NA,  61,  66 },
       {   4,   8,  13,  NA,  NA,  NA,  30,  NA,  NA,  NA,  43,  48,  53,  57,  62,  67 } };
 
@@ -345,6 +345,7 @@ static const std::vector<led_type> default_65pct_led_names =
 
 /**------------------------------------------------------------------*\
     @name Asus Aura Keyboard
+    @category Keyboard
     @type USB
     @save :x:
     @direct :white_check_mark:
@@ -404,7 +405,7 @@ void RGBController_AuraKeyboard::SetupZones()
         \*-----------------------------------------------------*/
         case SCOPE_LAYOUT:
             led_names = default_led_names;
-            led_zones.push_back({"Keyboard",    ZONE_TYPE_MATRIX, 106, new matrix_map_type{6, 22, (unsigned int *)&scope_matrix_map}});
+            led_zones.push_back({ZONE_EN_KEYBOARD,      ZONE_TYPE_MATRIX, 106, new matrix_map_type{6, 22, (unsigned int *)&scope_matrix_map}});
 
             led_names.insert(led_names.begin() + 7,     {KEY_EN_LEFT_WINDOWS,   0x15});
             led_names.insert(led_names.begin() + 12,    {KEY_EN_LEFT_ALT,       0x1D});
@@ -412,8 +413,8 @@ void RGBController_AuraKeyboard::SetupZones()
 
         case SCOPE_RX_LAYOUT:
             led_names = default_led_names;
-            led_zones.push_back({"Keyboard",    ZONE_TYPE_MATRIX, 106, new matrix_map_type{6, 22, (unsigned int *)&scope_matrix_map}});
-            led_zones.push_back({"Logo",        ZONE_TYPE_SINGLE, 1});
+            led_zones.push_back({ZONE_EN_KEYBOARD,      ZONE_TYPE_MATRIX, 106, new matrix_map_type{6, 22, (unsigned int *)&scope_matrix_map}});
+            led_zones.push_back({"Logo",                ZONE_TYPE_SINGLE, 1, NULL});
 
             led_names.insert(led_names.begin() + 7,     {KEY_EN_LEFT_WINDOWS,   0x15});
             led_names.insert(led_names.begin() + 12,    {KEY_EN_LEFT_ALT,       0x1D});
@@ -422,9 +423,9 @@ void RGBController_AuraKeyboard::SetupZones()
 
         case SCOPE_TKL_LAYOUT:
             led_names = default_tkl_led_names;
-            led_zones.push_back({"Keyboard",    ZONE_TYPE_MATRIX, 86, new matrix_map_type{6, 18, (unsigned int *)&scope_tkl_matrix_map}});
-            led_zones.push_back({"Logo",        ZONE_TYPE_LINEAR, 2});
-            led_zones.push_back({"Underglow",   ZONE_TYPE_LINEAR, 26});
+            led_zones.push_back({ZONE_EN_KEYBOARD,      ZONE_TYPE_MATRIX, 86, new matrix_map_type{6, 18, (unsigned int *)&scope_tkl_matrix_map}});
+            led_zones.push_back({"Logo",                ZONE_TYPE_LINEAR, 2, NULL});
+            led_zones.push_back({"Underglow",           ZONE_TYPE_LINEAR, 26, NULL});
 
             led_names.insert(led_names.begin() + 7,     {KEY_EN_LEFT_WINDOWS,   0x15});
             led_names.insert(led_names.begin() + 12,    {KEY_EN_LEFT_ALT,       0x1D});
@@ -432,9 +433,9 @@ void RGBController_AuraKeyboard::SetupZones()
 
         case FLARE_LAYOUT:
             led_names = default_led_names;
-            led_zones.push_back({"Keyboard",    ZONE_TYPE_MATRIX, 106, new matrix_map_type{6, 22, (unsigned int *)&flare_matrix_map}});
-            led_zones.push_back({"Logo",        ZONE_TYPE_SINGLE, 1});
-            led_zones.push_back({"Underglow",   ZONE_TYPE_SINGLE, 2});
+            led_zones.push_back({ZONE_EN_KEYBOARD,      ZONE_TYPE_MATRIX, 106, new matrix_map_type{6, 22, (unsigned int *)&flare_matrix_map}});
+            led_zones.push_back({"Logo",                ZONE_TYPE_SINGLE, 1, NULL});
+            led_zones.push_back({"Underglow",           ZONE_TYPE_SINGLE, 2, NULL});
 
             led_names.insert(led_names.begin() + 7,     {KEY_EN_LEFT_WINDOWS,   0x0D});
             led_names.insert(led_names.begin() + 12,    {KEY_EN_LEFT_ALT,       0x15});
@@ -446,7 +447,7 @@ void RGBController_AuraKeyboard::SetupZones()
 
         case FALCHION_LAYOUT:
             led_names = default_65pct_led_names;
-            led_zones.push_back({"Keyboard",    ZONE_TYPE_MATRIX, 68, new matrix_map_type{5, 16, (unsigned int *)&falchion_matrix_map}});
+            led_zones.push_back({ZONE_EN_KEYBOARD,      ZONE_TYPE_MATRIX, 68, new matrix_map_type{5, 16, (unsigned int *)&falchion_matrix_map}});
             break;
     }
 
@@ -526,11 +527,6 @@ void RGBController_AuraKeyboard::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_AuraKeyboard::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_AuraKeyboard::DeviceUpdateMode()
 {
 

Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.h

@@ -48,7 +48,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:

Controllers/AsusAuraUSBController/RGBController_AsusAuraMonitor.cpp

@@ -11,6 +11,7 @@
 
 /**------------------------------------------------------------------*\
     @name Asus Aura Monitor
+    @category LEDStrip
     @type USB
     @save :x:
     @direct :white_check_mark:
@@ -79,6 +80,8 @@ void RGBController_AuraMonitor::ResizeZone(int /*zone*/, int /*new_size*/)
 
 void RGBController_AuraMonitor::DeviceUpdateLEDs()
 {
+    controller->BeginUpdate();
+
     for (int i = 0; i < 3; i++)
     {
         unsigned char red   = RGBGetRValue(colors[i]);
@@ -98,6 +101,8 @@ void RGBController_AuraMonitor::UpdateZoneLEDs(int /*zone*/)
 
 void RGBController_AuraMonitor::UpdateSingleLED(int led)
 {
+    controller->BeginUpdate();
+
     unsigned char red   = RGBGetRValue(colors[led]);
     unsigned char green = RGBGetGValue(colors[led]);
     unsigned char blue  = RGBGetBValue(colors[led]);
@@ -107,12 +112,6 @@ void RGBController_AuraMonitor::UpdateSingleLED(int led)
     controller->ApplyChanges();
 }
 
-void RGBController_AuraMonitor::SetCustomMode()
-{
-    active_mode = 0;
-}
-
-
 void RGBController_AuraMonitor::DeviceUpdateMode()
 {
     /*---------------------------------------------------------*\

Controllers/AsusAuraUSBController/RGBController_AsusAuraMonitor.h

@@ -25,7 +25,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
     void        DeviceSaveMode();
 

Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp

@@ -18,6 +18,7 @@ static std::string aura_mouse_zone_names[3]
 
 /**------------------------------------------------------------------*\
     @name Asus Aura Mouse
+    @category Mouse
     @type USB
     @save :white_check_mark:
     @direct :white_check_mark:
@@ -54,9 +55,9 @@ RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* controller
                     Direct.name                 = "Direct";
                     Direct.value                = mode_value;
                     Direct.flags                = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_MANUAL_SAVE | MODE_FLAG_HAS_BRIGHTNESS;
-                    Direct.brightness_min       = AURA_MOUSE_BRIGHTNESS_MIN;
-                    Direct.brightness_max       = AURA_MOUSE_BRIGHTNESS_MAX;
-                    Direct.brightness           = AURA_MOUSE_BRIGHTNESS_DEFAULT;
+                    Direct.brightness_min       = aura_mouse_devices[pid].brightness_min;
+                    Direct.brightness_max       = aura_mouse_devices[pid].brightness_max;
+                    Direct.brightness           = aura_mouse_devices[pid].brightness_max;
                     Direct.color_mode           = MODE_COLORS_PER_LED;
                     modes.push_back(Direct);
                 }
@@ -68,9 +69,9 @@ RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* controller
                     Breathing.name              = "Breathing";
                     Breathing.value             = mode_value;
                     Breathing.flags             = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_MANUAL_SAVE | MODE_FLAG_HAS_BRIGHTNESS;
-                    Breathing.brightness_min    = AURA_MOUSE_BRIGHTNESS_MIN;
-                    Breathing.brightness_max    = AURA_MOUSE_BRIGHTNESS_MAX;
-                    Breathing.brightness        = AURA_MOUSE_BRIGHTNESS_DEFAULT;
+                    Breathing.brightness_min    = aura_mouse_devices[pid].brightness_min;
+                    Breathing.brightness_max    = aura_mouse_devices[pid].brightness_max;
+                    Breathing.brightness        = aura_mouse_devices[pid].brightness_max;
                     Breathing.color_mode        = MODE_COLORS_PER_LED;
                     modes.push_back(Breathing);
                 }
@@ -82,9 +83,9 @@ RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* controller
                     ColorCycle.name             = "Spectrum Cycle";
                     ColorCycle.value            = mode_value;
                     ColorCycle.flags            = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE ;
-                    ColorCycle.brightness_min   = AURA_MOUSE_BRIGHTNESS_MIN;
-                    ColorCycle.brightness_max   = AURA_MOUSE_BRIGHTNESS_MAX;
-                    ColorCycle.brightness       = AURA_MOUSE_BRIGHTNESS_DEFAULT;
+                    ColorCycle.brightness_min   = aura_mouse_devices[pid].brightness_min;
+                    ColorCycle.brightness_max   = aura_mouse_devices[pid].brightness_max;
+                    ColorCycle.brightness       = aura_mouse_devices[pid].brightness_max;
                     ColorCycle.color_mode       = MODE_COLORS_NONE;
                     modes.push_back(ColorCycle);
                 }
@@ -100,9 +101,9 @@ RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* controller
                     Wave.speed_min              = aura_mouse_devices[pid].speed_min;
                     Wave.speed_max              = aura_mouse_devices[pid].speed_max;
                     Wave.speed                  = (aura_mouse_devices[pid].speed_min + aura_mouse_devices[pid].speed_max) / 2;
-                    Wave.brightness_min         = AURA_MOUSE_BRIGHTNESS_MIN;
-                    Wave.brightness_max         = AURA_MOUSE_BRIGHTNESS_MAX;
-                    Wave.brightness             = AURA_MOUSE_BRIGHTNESS_DEFAULT;
+                    Wave.brightness_min         = aura_mouse_devices[pid].brightness_min;
+                    Wave.brightness_max         = aura_mouse_devices[pid].brightness_max;
+                    Wave.brightness             = aura_mouse_devices[pid].brightness_max;
                     Wave.color_mode             = MODE_COLORS_NONE;
                     modes.push_back(Wave);
                 }
@@ -114,9 +115,9 @@ RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* controller
                     Reactive.name               = "Reactive";
                     Reactive.value              = mode_value;
                     Reactive.flags              = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_MANUAL_SAVE | MODE_FLAG_HAS_BRIGHTNESS;
-                    Reactive.brightness_min     = AURA_MOUSE_BRIGHTNESS_MIN;
-                    Reactive.brightness_max     = AURA_MOUSE_BRIGHTNESS_MAX;
-                    Reactive.brightness         = AURA_MOUSE_BRIGHTNESS_DEFAULT;
+                    Reactive.brightness_min     = aura_mouse_devices[pid].brightness_min;
+                    Reactive.brightness_max     = aura_mouse_devices[pid].brightness_max;
+                    Reactive.brightness         = aura_mouse_devices[pid].brightness_max;
                     Reactive.color_mode         = MODE_COLORS_PER_LED;
                     modes.push_back(Reactive);
                 }
@@ -128,9 +129,9 @@ RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* controller
                     Comet.name                  = "Comet";
                     Comet.value                 = mode_value;
                     Comet.flags                 = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_MANUAL_SAVE | MODE_FLAG_HAS_BRIGHTNESS;
-                    Comet.brightness_min        = AURA_MOUSE_BRIGHTNESS_MIN;
-                    Comet.brightness_max        = AURA_MOUSE_BRIGHTNESS_MAX;
-                    Comet.brightness            = AURA_MOUSE_BRIGHTNESS_DEFAULT;
+                    Comet.brightness_min        = aura_mouse_devices[pid].brightness_min;
+                    Comet.brightness_max        = aura_mouse_devices[pid].brightness_max;
+                    Comet.brightness            = aura_mouse_devices[pid].brightness_max;
                     Comet.color_mode            = MODE_COLORS_MODE_SPECIFIC;
                     Comet.direction             = 0;
                     Comet.colors_min            = 1;
@@ -146,9 +147,9 @@ RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* controller
                     BatteryMode.name            = "Battery";
                     BatteryMode.value           = mode_value;
                     BatteryMode.flags           = MODE_FLAG_MANUAL_SAVE | MODE_FLAG_HAS_BRIGHTNESS;
-                    BatteryMode.brightness_min  = AURA_MOUSE_BRIGHTNESS_MIN;
-                    BatteryMode.brightness_max  = AURA_MOUSE_BRIGHTNESS_MAX;
-                    BatteryMode.brightness      = AURA_MOUSE_BRIGHTNESS_DEFAULT;
+                    BatteryMode.brightness_min  = aura_mouse_devices[pid].brightness_min;
+                    BatteryMode.brightness_max  = aura_mouse_devices[pid].brightness_max;
+                    BatteryMode.brightness      = aura_mouse_devices[pid].brightness_max;
                     BatteryMode.color_mode      = MODE_COLORS_NONE;
                     modes.push_back(BatteryMode);
                 }
@@ -220,11 +221,6 @@ void RGBController_AuraMouse::UpdateSingleLED(int led)
     controller->SendUpdate(leds[led].value, modes[active_mode].value, red, grn, blu, 0, false, 0, modes[active_mode].brightness);
 }
 
-void RGBController_AuraMouse::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_AuraMouse::DeviceUpdateMode()
 {
     if(modes[active_mode].color_mode == MODE_COLORS_PER_LED)

Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.h

@@ -11,12 +11,6 @@
 #include "RGBController.h"
 #include "AsusAuraMouseController.h"
 
-enum {
-    AURA_MOUSE_BRIGHTNESS_MIN     = 0,
-    AURA_MOUSE_BRIGHTNESS_MAX     = 4,
-    AURA_MOUSE_BRIGHTNESS_DEFAULT = 4
-};
-
 class RGBController_AuraMouse : public RGBController
 {
 public:
@@ -31,7 +25,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
     void        DeviceSaveMode();
 

Controllers/AsusAuraUSBController/RGBController_AsusAuraMousemat.cpp

@@ -11,6 +11,7 @@
 
 /**------------------------------------------------------------------*\
     @name Asus Aura Mousemat
+    @category Mousemat
     @type USB
     @save :white_check_mark:
     @direct :white_check_mark:
@@ -21,15 +22,15 @@
 
 RGBController_AuraMousemat::RGBController_AuraMousemat(AuraMousematController* controller_ptr)
 {
-    controller  = controller_ptr;
+    controller                  = controller_ptr;
 
-    name        = "ASUS Aura Mousemat";
-    vendor      = "ASUS";
-    type        = DEVICE_TYPE_MOUSEMAT;
-    description = "ASUS Aura Mousemat Device";
-    version     = controller->GetVersion();
-    location    = controller->GetDeviceLocation();
-    serial      = controller->GetSerialString();
+    name                        = "ASUS Aura Mousemat";
+    vendor                      = "ASUS";
+    type                        = DEVICE_TYPE_MOUSEMAT;
+    description                 = "ASUS Aura Mousemat Device";
+    version                     = controller->GetVersion();
+    location                    = controller->GetDeviceLocation();
+    serial                      = controller->GetSerialString();
 
     mode Direct;
     Direct.name                 = "Direct";
@@ -229,11 +230,6 @@ void RGBController_AuraMousemat::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_AuraMousemat::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_AuraMousemat::DeviceUpdateMode()
 {
     if(modes[active_mode].value == AURA_MOUSEMAT_MODE_DIRECT)
@@ -259,7 +255,7 @@ void RGBController_AuraMousemat::DeviceUpdateMode()
             case AURA_MOUSEMAT_MODE_WAVE:
                 pattern = modes[active_mode].colors.size() * 16 + modes[active_mode].direction;
                 break;
-            case AURA_MOUSEMAT_MODE_WAVE_PLANE:       
+            case AURA_MOUSEMAT_MODE_WAVE_PLANE:
                 switch(modes[active_mode].direction)
                 {
                     case MODE_DIRECTION_LEFT:

Controllers/AsusAuraUSBController/RGBController_AsusAuraMousemat.h

@@ -43,7 +43,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
     void        DeviceSaveMode();
 

Controllers/AsusAuraUSBController/RGBController_AsusAuraRyuoAIO.cpp

@@ -0,0 +1,218 @@
+/*-------------------------------------------------------------------*\
+|  RGBController_AsusAuraRyuoAIO.cpp                                  |
+|                                                                     |
+|  Driver for the ASUS Aura Ryuo AIO                                  |
+|    lighting controller                                              |
+|                                                                     |
+|  Cooper Hall (geobot19 / Geo_bot)          08 Apr 2022              |
+|  using snipets from Chris M (Dr.No)                                 |
+\*-------------------------------------------------------------------*/
+
+#include "RGBControllerKeyNames.h"
+#include "RGBController_AsusAuraRyuoAIO.h"
+
+/**------------------------------------------------------------------*\
+    @name Asus Aura Ryuo AIO 
+    @type USB
+    @save :white_check_mark:
+    @direct :white_check_mark:
+    @effects :white_check_mark:
+    @detectors DetectAsusAuraUSBMousemats
+    @category Cooler
+    @comment
+\*-------------------------------------------------------------------*/
+
+RGBController_AsusAuraRyuoAIO::RGBController_AsusAuraRyuoAIO(AsusAuraRyuoAIOController *controller_ptr)
+{
+    controller                  = controller_ptr;
+    uint8_t speed               = controller->SPEED_NORMAL;
+
+    name                        = "ROG Ryuo AIO";
+    vendor                      = "ASUS";
+    type                        = DEVICE_TYPE_COOLER;
+    description                 = "ASUS Liquid Cooler with 120mm and 240mm radiators.";
+    location                    = controller->GetLocation();
+
+    mode Direct;
+    Direct.name                 = "Direct";
+    Direct.value                = controller->MODE_DIRECT;
+    Direct.flags                = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode           = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
+    mode Static;
+    Static.name                 = "Static";
+    Static.value                = controller->MODE_STATIC;
+    Static.flags                = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR;
+    Static.colors_min           = 1;
+    Static.colors_max           = 1;
+    Static.colors.resize(Static.colors_max);
+    Static.color_mode           = MODE_COLORS_MODE_SPECIFIC;
+    modes.push_back(Static);
+
+    mode Breathing;
+    Breathing.name              = "Breathing";
+    Breathing.value             = controller->MODE_BREATHING;
+    Breathing.flags             = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR;
+    Breathing.colors_min        = 1;
+    Breathing.colors_max        = 1;
+    Breathing.colors.resize(Breathing.colors_max);
+    Breathing.brightness_min    = ASUSAURARYUOAIOCONTROLLER_BRIGHTNESS_MIN;
+    Breathing.brightness_max    = ASUSAURARYUOAIOCONTROLLER_BRIGHTNESS_MAX;
+    Breathing.brightness        = ASUSAURARYUOAIOCONTROLLER_BRIGHTNESS_MAX;
+    Breathing.speed_min         = controller->SPEED_SLOWEST;
+    Breathing.speed_max         = controller->SPEED_FASTEST;
+    Breathing.color_mode        = MODE_COLORS_MODE_SPECIFIC;
+    Breathing.speed             = speed;
+    modes.push_back(Breathing);
+
+    mode Flashing;
+    Flashing.name               = "Flashing";
+    Flashing.value              = controller->MODE_FLASHING;
+    Flashing.flags              = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR;
+    Flashing.colors_min         = 1;
+    Flashing.colors_max         = 1;
+    Flashing.colors.resize(Flashing.colors_max);
+    Flashing.brightness_min     = ASUSAURARYUOAIOCONTROLLER_BRIGHTNESS_MIN;
+    Flashing.brightness_max     = ASUSAURARYUOAIOCONTROLLER_BRIGHTNESS_MAX;
+    Flashing.brightness         = ASUSAURARYUOAIOCONTROLLER_BRIGHTNESS_MAX;
+    Flashing.speed_min          = controller->SPEED_SLOWEST;
+    Flashing.speed_max          = controller->SPEED_FASTEST;
+    Flashing.color_mode         = MODE_COLORS_MODE_SPECIFIC;
+    Flashing.speed              = speed;
+    modes.push_back(Flashing);
+
+    mode Spectrum;
+    Spectrum.name               = "Spectrum";
+    Spectrum.value              = controller->MODE_SPECTRUM;
+    Spectrum.flags              = MODE_FLAG_HAS_SPEED;
+    Spectrum.brightness_min     = ASUSAURARYUOAIOCONTROLLER_BRIGHTNESS_MIN;
+    Spectrum.brightness_max     = ASUSAURARYUOAIOCONTROLLER_BRIGHTNESS_MAX;
+    Spectrum.brightness         = ASUSAURARYUOAIOCONTROLLER_BRIGHTNESS_MAX;
+    Spectrum.speed_min          = controller->SPEED_SLOWEST;
+    Spectrum.speed_max          = controller->SPEED_FASTEST;
+    Spectrum.color_mode         = MODE_COLORS_NONE;
+    Spectrum.speed              = speed;
+    modes.push_back(Spectrum);
+
+    mode Rainbow;
+    Rainbow.name                = "Rainbow";
+    Rainbow.value               = controller->MODE_RAINBOW;
+    Rainbow.flags               = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR;
+    Rainbow.brightness_min      = ASUSAURARYUOAIOCONTROLLER_BRIGHTNESS_MIN;
+    Rainbow.brightness_max      = ASUSAURARYUOAIOCONTROLLER_BRIGHTNESS_MAX;
+    Rainbow.brightness          = ASUSAURARYUOAIOCONTROLLER_BRIGHTNESS_MAX;
+    Rainbow.speed_min           = controller->SPEED_SLOWEST;
+    Rainbow.speed_max           = controller->SPEED_FASTEST;
+    Rainbow.color_mode          = MODE_COLORS_NONE;
+    Rainbow.speed               = speed;
+    modes.push_back(Rainbow);
+
+    mode FlashAndDash;
+    FlashAndDash.name           = "Flash and Dash";
+    FlashAndDash.value          = controller->MODE_FLASHANDDASH;
+    FlashAndDash.flags          = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR;
+    FlashAndDash.brightness_min = ASUSAURARYUOAIOCONTROLLER_BRIGHTNESS_MIN;
+    FlashAndDash.brightness_max = ASUSAURARYUOAIOCONTROLLER_BRIGHTNESS_MAX;
+    FlashAndDash.brightness     = ASUSAURARYUOAIOCONTROLLER_BRIGHTNESS_MAX;
+    FlashAndDash.speed_min      = controller->SPEED_SLOWEST;
+    FlashAndDash.speed_max      = controller->SPEED_FASTEST;
+    FlashAndDash.color_mode     = MODE_COLORS_NONE;
+    FlashAndDash.speed          = speed;
+    modes.push_back(FlashAndDash);
+
+    SetupZones();
+}
+
+RGBController_AsusAuraRyuoAIO::~RGBController_AsusAuraRyuoAIO()
+{
+    delete controller;
+}
+
+void RGBController_AsusAuraRyuoAIO::SetupZones()
+{
+    /*-------------------------------------------------*\
+    | Set up zones                                      |
+    \*-------------------------------------------------*/
+    LOG_DEBUG("[%s] - Get channel count: %i", name.c_str(), controller->GetChannelCount());
+
+    zones.resize(controller->GetChannelCount());
+
+    LOG_DEBUG("[%s] - Creating Zones and LEDs", name.c_str());
+    for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
+    {
+        AuraDeviceInfo device_info = controller->GetAuraDevices()[zone_idx];
+        LOG_INFO("[%s] %s Zone %i - Header Count %i LED Count %i FX %02X Direct %02X", name.c_str(),
+                 ((device_info.device_type == AuraDeviceType::FIXED) ? "Fixed" : "Addressable"),
+                 zone_idx, device_info.num_headers, device_info.num_leds, device_info.effect_channel, device_info.direct_channel);
+
+        zones[zone_idx].name = name + " Zone ";
+        zones[zone_idx].name.append(std::to_string(zone_idx));
+        zones[zone_idx].type = ZONE_TYPE_LINEAR;
+        zones[zone_idx].leds_min = device_info.num_leds;
+        zones[zone_idx].leds_max = device_info.num_leds;
+        zones[zone_idx].leds_count = device_info.num_leds;
+
+        for(unsigned int lp_idx = 0; lp_idx < zones[zone_idx].leds_count; lp_idx++)
+        {
+            led new_led;
+
+            new_led.name = zones[zone_idx].name;
+            new_led.name.append(" LED " + std::to_string(lp_idx));
+            new_led.value = lp_idx;
+
+            leds.push_back(new_led);
+        }
+    }
+
+    LOG_DEBUG("[%s] - Device zones and LEDs set", name.c_str());
+    SetupColors();
+}
+
+void RGBController_AsusAuraRyuoAIO::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_AsusAuraRyuoAIO::DeviceUpdateLEDs()
+{
+    for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
+    {
+        UpdateZoneLEDs(zone_idx);
+    }
+}
+
+void RGBController_AsusAuraRyuoAIO::UpdateZoneLEDs(int zone)
+{
+    controller->SetLedsDirect(zones[zone].colors, zones[zone].leds_count);
+}
+
+void RGBController_AsusAuraRyuoAIO::UpdateSingleLED(int led)
+{
+    UpdateZoneLEDs(GetLED_Zone(led));
+}
+
+void RGBController_AsusAuraRyuoAIO::DeviceUpdateMode()
+{
+    RGBColor colour = (modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC) ? modes[active_mode].colors[0] : 0;
+
+    controller->SetMode(modes[active_mode].value, modes[active_mode].speed, modes[active_mode].direction, colour);
+}
+
+int RGBController_AsusAuraRyuoAIO::GetLED_Zone(int led_idx)
+{
+    for(size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
+    {
+        int zone_start = zones[zone_idx].start_idx;
+        int zone_end = zone_start + zones[zone_idx].leds_count - 1;
+
+        if( zone_start <= led_idx && zone_end >= led_idx)
+        {
+            return(zone_idx);
+        }
+    }
+
+    return -1;
+}

Controllers/AsusAuraUSBController/RGBController_AsusAuraRyuoAIO.h

@@ -0,0 +1,38 @@
+/*-------------------------------------------------------------------*\
+|  RGBController_AsusAuraRyuoAIO.h                                    |
+|                                                                     |
+|  Driver for the ASUS Aura Ryuo AIO                                  |
+|    lighting controller                                              |
+|                                                                     |
+|  Cooper Hall (geobot19 / Geo_bot)          08 Apr 2022              |
+|  using snipets from Chris M (Dr.No)                                 |
+\*-------------------------------------------------------------------*/
+
+#pragma once
+#include "LogManager.h"
+#include "RGBController.h"
+#include "AsusAuraRyuoAIOController.h"
+#include <vector>
+
+class RGBController_AsusAuraRyuoAIO : public RGBController
+{
+public:
+    RGBController_AsusAuraRyuoAIO(AsusAuraRyuoAIOController* controller_ptr);
+    ~RGBController_AsusAuraRyuoAIO();
+
+    void SetupZones();
+    void ResizeZone(int zone, int new_size);
+
+    void DeviceUpdateLEDs();
+    void UpdateZoneLEDs(int zone);
+    void UpdateSingleLED(int led);
+
+    void DeviceUpdateMode();
+
+private:
+    int  GetDeviceMode();
+    int  GetLED_Zone(int led_idx);
+
+    AsusAuraRyuoAIOController* controller;
+};
+

Controllers/AsusAuraUSBController/RGBController_AsusAuraStrixEvolve.cpp

@@ -11,6 +11,7 @@
 
 /**------------------------------------------------------------------*\
     @name Asus Aura Strix Evolve
+    @category Mouse
     @type USB
     @save :white_check_mark:
     @direct :white_check_mark:
@@ -128,11 +129,6 @@ void RGBController_AuraStrixEvolve::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_AuraStrixEvolve::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_AuraStrixEvolve::DeviceUpdateMode()
 {
     unsigned char red = RGBGetRValue(colors[0]);

Controllers/AsusAuraUSBController/RGBController_AsusAuraStrixEvolve.h

@@ -32,7 +32,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
     void        DeviceSaveMode();
 

Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp

@@ -13,6 +13,7 @@
 
 /**------------------------------------------------------------------*\
     @name Asus Aura TUF Keyboard
+    @category Keyboard
     @type USB
     @save :white_check_mark:
     @direct :white_check_mark:
@@ -222,7 +223,7 @@ void RGBController_AuraTUFKeyboard::SetupZones()
     int zone_size = 138;
 
     zone keyboard;
-    keyboard.name               = "Keyboard";
+    keyboard.name               = ZONE_EN_KEYBOARD;
     keyboard.type               = ZONE_TYPE_MATRIX;
     keyboard.leds_min           = zone_size;
     keyboard.leds_max           = zone_size;
@@ -270,13 +271,8 @@ void RGBController_AuraTUFKeyboard::UpdateSingleLED(int led)
     controller->UpdateSingleLed(led, red, green, blue);
 }
 
-void RGBController_AuraTUFKeyboard::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_AuraTUFKeyboard::DeviceUpdateMode()
-{   
+{
     unsigned char color_mode;
     std::vector<RGBColor> mode_colors;
 

Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.h

@@ -35,7 +35,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
     void        DeviceSaveMode();
 

Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp

@@ -11,12 +11,13 @@
 
 /**------------------------------------------------------------------*\
     @name Asus Aura USB
+    @category Motherboard
     @type USB
     @save :x:
     @direct :white_check_mark:
     @effects :white_check_mark:
     @detectors DetectAsusAuraUSBTerminal,DetectAsusAuraUSBAddressable,DetectAsusAuraUSBMotherboards
-    @comment The Asus AUra USB controller applies to most AMD and
+    @comment The Asus Aura USB controller applies to most AMD and
         Intel mainboards from the x470 and z390 chipsets onwards.
 \*-------------------------------------------------------------------*/
 
@@ -248,11 +249,6 @@ void RGBController_AuraUSB::UpdateSingleLED(int led)
     controller->SetChannelLEDs(channel, zones[channel].colors, zones[channel].leds_count);
 }
 
-void RGBController_AuraUSB::SetCustomMode()
-{
-
-}
-
 void RGBController_AuraUSB::DeviceUpdateMode()
 {
     initializedMode   = true;

Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.h

@@ -27,7 +27,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:

Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.cpp

@@ -13,6 +13,7 @@
 
 /**------------------------------------------------------------------*\
     @name Asus ROG Strix Liquid Cooler
+    @category Cooler
     @type USB
     @save :x:
     @direct :white_check_mark:
@@ -170,7 +171,7 @@ void RGBController_ROGStrixLC_Controller::SetupZones()
     SetupColors();
 }
 
-void RGBController_ROGStrixLC_Controller::ResizeZone(int zone, int new_size)
+void RGBController_ROGStrixLC_Controller::ResizeZone(int /*zone*/, int /*new_size*/)
 {
     /*---------------------------------------------------------*\
     | This device does not support resizing zones               |
@@ -195,18 +196,6 @@ void RGBController_ROGStrixLC_Controller::UpdateSingleLED(int led)
     UpdateZoneLEDs(GetLED_Zone(led));
 }
 
-void RGBController_ROGStrixLC_Controller::SetCustomMode()
-{
-    for(std::size_t mode_idx = 0; mode_idx < modes.size() ; mode_idx++)
-    {
-        if (modes[mode_idx].value == ROGSTRIXLC_CONTROLLER_MODE_DIRECT)
-        {
-            active_mode = mode_idx;
-            break;
-        }
-    }
-}
-
 void RGBController_ROGStrixLC_Controller::DeviceUpdateMode()
 {
     RGBColor colour         = (modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC) ? modes[active_mode].colors[0] : 0;

Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.h

@@ -27,7 +27,6 @@ public:
     void                UpdateZoneLEDs(int zone);
     void                UpdateSingleLED(int led);
 
-    void                SetCustomMode();
     void                DeviceUpdateMode();
 private:
     int                 GetDeviceMode();

Controllers/AsusAuraUSBController/ROGStrixLC_Controller.cpp

@@ -12,9 +12,6 @@
 
 ROGStrixLC_Controller::ROGStrixLC_Controller(hid_device* dev_handle, const char* path) : AuraUSBController(dev_handle, path)
 {
-    const int szTemp = HID_MAX_STR;
-    wchar_t tmpName[szTemp];
-
     /*-----------------------------------------------------*\
     | Add addressable devices                               |
     |    Manually adding device info for now                |
@@ -34,7 +31,7 @@ std::string ROGStrixLC_Controller::GetLocation()
     return("HID: " + location);
 }
 
-void ROGStrixLC_Controller::SetMode(unsigned char channel, unsigned char mode, unsigned char red, unsigned char grn, unsigned char blu)
+void ROGStrixLC_Controller::SetMode(unsigned char /*channel*/, unsigned char /*mode*/, unsigned char /*red*/, unsigned char /*grn*/, unsigned char /*blu*/)
 {
     /*---------------------------------------------------------*\
     | This interface is not used in this controller however is  |
@@ -58,7 +55,7 @@ void ROGStrixLC_Controller::SetMode(unsigned char mode, unsigned char speed, uns
     }
 }
 
-void ROGStrixLC_Controller::SetChannelLEDs(unsigned char channel, RGBColor * colors, unsigned int num_colors)
+void ROGStrixLC_Controller::SetChannelLEDs(unsigned char /*channel*/, RGBColor* /*colors*/, unsigned int /*num_colors*/)
 {
     /*---------------------------------------------------------*\
     | This interface is not used in this controller however is  |

Controllers/AsusLegacyUSBController/AsusLegacyUSBControllerDetect.cpp

@@ -0,0 +1,26 @@
+#include "Detector.h"
+#include "AsusStrixClawController.h"
+#include "RGBController.h"
+#include "RGBController_AsusStrixClaw.h"
+#include <stdexcept>
+#include <hidapi/hidapi.h>
+#include "dependencies/dmiinfo.h"
+
+#define ASUS_LEGACY_USB_VID         0x195D
+
+#define ASUS_ROG_STRIX_CLAW_PID     0x1016
+
+void DetectAsusStrixClaw(hid_device_info* info, const std::string& name)
+{
+    hid_device* dev = hid_open_path(info->path);
+
+    if(dev)
+    {
+        StrixClawController*     controller          = new StrixClawController(dev, info->path);
+        RGBController_StrixClaw* rgb_controller      = new RGBController_StrixClaw(controller);
+        rgb_controller->name = name;
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
+    }
+}
+
+REGISTER_HID_DETECTOR_IPU("ASUS ROG Strix Claw", DetectAsusStrixClaw,  ASUS_LEGACY_USB_VID, ASUS_ROG_STRIX_CLAW_PID, 0, 0xFF01, 1);

Controllers/AsusLegacyUSBController/AsusStrixClawController.cpp

@@ -0,0 +1,97 @@
+/*-----------------------------------------*\
+|  AsusStrixClawController.cpp              |
+|                                           |
+|  Driver for ASUS Strix USB                |
+|  lighting controller                      |
+|                                           |
+|  Mola19 08/06/2022                        |
+\*-----------------------------------------*/
+
+#include "AsusStrixClawController.h"
+
+#include <cstring>
+#include <string>
+
+StrixClawController::StrixClawController(hid_device* dev_handle, const char* path)
+{
+    dev         = dev_handle;
+    location    = path;
+}
+
+StrixClawController::~StrixClawController()
+{
+    hid_close(dev);
+}
+
+std::string StrixClawController::GetDeviceLocation()
+{
+    return("HID: " + location);
+}
+
+std::string StrixClawController::GetSerialString()
+{
+    wchar_t serial_string[HID_MAX_STR];
+    int ret = hid_get_serial_number_string(dev, serial_string, HID_MAX_STR);
+
+    if(ret != 0)
+    {
+        return("");
+    }
+
+    std::wstring return_wstring = serial_string;
+    std::string return_string(return_wstring.begin(), return_wstring.end());
+
+    return(return_string);
+}
+
+std::string StrixClawController::GetVersion()
+{
+
+    // asking the device to prepare version information
+    unsigned char usb_buf_out[9];
+
+    memset(usb_buf_out, 0x00, 9);
+
+    usb_buf_out[0x00] = 0x07;
+    usb_buf_out[0x01] = 0x80;
+
+    hid_send_feature_report(dev, usb_buf_out, 9);
+
+    // retrieving the version information
+    unsigned char usb_buf_in[9];
+
+    memset(usb_buf_in, 0x00, 9);
+
+    usb_buf_in[0x00] = 0x07;
+
+    hid_get_feature_report(dev, usb_buf_in, 9);
+
+    return (std::to_string(usb_buf_in[1]) + std::to_string(usb_buf_in[2]));
+}
+
+void StrixClawController::SetScrollWheelLED(bool OnOff)
+{
+    unsigned char usb_buf[9];
+
+    memset(usb_buf, 0x00, 9);
+
+    usb_buf[0x00] = 0x07;
+    usb_buf[0x01] = 0x07;
+    usb_buf[0x02] = 0x01;
+    usb_buf[0x03] = OnOff;
+    hid_send_feature_report(dev, usb_buf, 9);
+}
+
+void StrixClawController::SetLogoLED(uint8_t brightness)
+{
+    unsigned char usb_buf[9];
+
+    memset(usb_buf, 0x00, 9);
+
+    usb_buf[0x00] = 0x07;
+    usb_buf[0x01] = 0x0a;
+    usb_buf[0x02] = 0x01;
+    usb_buf[0x03] = 0x00;
+    usb_buf[0x04] = brightness;
+    hid_send_feature_report(dev, usb_buf, 9);
+}

Controllers/AsusLegacyUSBController/AsusStrixClawController.h

@@ -0,0 +1,35 @@
+/*-----------------------------------------*\
+|  AsusStrixClawController.h                |
+|                                           |
+|  Definitions and types for ASUS           |
+|  Legacy USB RGB lighting controller       |
+|                                           |
+|  Mola19 08/06/2022                        |
+\*-----------------------------------------*/
+
+#include "RGBController.h"
+
+#include <string>
+#include <hidapi/hidapi.h>
+
+#pragma once
+
+#define HID_MAX_STR 255
+
+class StrixClawController
+{
+public:
+    StrixClawController(hid_device* dev_handle, const char* path);
+    virtual ~StrixClawController();
+
+    std::string GetDeviceLocation();
+    std::string GetSerialString();
+    std::string GetVersion();
+
+    void SetScrollWheelLED(bool OnOff);
+    void SetLogoLED(uint8_t brightness);
+
+private:
+    hid_device*                 dev;
+    std::string                 location;
+};

Controllers/AsusLegacyUSBController/RGBController_AsusStrixClaw.cpp

@@ -0,0 +1,132 @@
+/*-----------------------------------------*\
+|  RGBController_AsusStrixClaw.cpp          |
+|                                           |
+|  Generic RGB Interface for Asus           |
+|  Legacy USB controller driver             |
+|                                           |
+|  Mola19 08/06/2022                        |
+\*-----------------------------------------*/
+
+#include "RGBController_AsusStrixClaw.h"
+
+/**------------------------------------------------------------------*\
+    @name Asus Strix Claw
+    @category Mouse
+    @type USB
+    @save :robot:
+    @direct :x:
+    @effects :tools:
+    @detectors DetectAsusStrixClaw
+    @comment
+\*-------------------------------------------------------------------*/
+
+RGBController_StrixClaw::RGBController_StrixClaw(StrixClawController* controller_ptr)
+{
+    controller   = controller_ptr;
+
+    name         = "ASUS ROG Strix Claw";
+    vendor       = "ASUS";
+    type         = DEVICE_TYPE_MOUSE;
+    description  = "ASUS Legacy Mouse Device";
+    version      = controller->GetVersion();
+    location     = controller->GetDeviceLocation();
+    serial       = controller->GetSerialString();
+
+    mode Off;
+    Off.name        = "Off";
+    Off.value       = 0;
+    Off.flags       = MODE_FLAG_AUTOMATIC_SAVE;
+    Off.color_mode  = MODE_COLORS_NONE;
+    modes.push_back(Off);
+
+    mode On;
+    On.name         = "On";
+    On.value        = 1;
+    On.flags        = MODE_FLAG_AUTOMATIC_SAVE;
+    On.color_mode   = MODE_COLORS_NONE;
+    modes.push_back(On);
+
+    SetupZones();
+}
+
+RGBController_StrixClaw::~RGBController_StrixClaw()
+{
+    delete controller;
+}
+
+void RGBController_StrixClaw::SetupZones()
+{
+    zone scroll_wheel_zone;
+
+    scroll_wheel_zone.name         = "Scroll Wheel";
+    scroll_wheel_zone.type         = ZONE_TYPE_SINGLE;
+    scroll_wheel_zone.leds_min     = 1;
+    scroll_wheel_zone.leds_max     = 1;
+    scroll_wheel_zone.leds_count   = 1;
+    scroll_wheel_zone.matrix_map   = NULL;
+
+    zones.push_back(scroll_wheel_zone);
+
+    led scroll_wheel_led;
+
+    scroll_wheel_led.name          = "Scroll Wheel LED";
+    scroll_wheel_led.value         = 1;
+
+    leds.push_back(scroll_wheel_led);
+
+    zone logo_zone;
+
+    logo_zone.name         = "Logo";
+    logo_zone.type         = ZONE_TYPE_SINGLE;
+    logo_zone.leds_min     = 1;
+    logo_zone.leds_max     = 1;
+    logo_zone.leds_count   = 1;
+    logo_zone.matrix_map   = NULL;
+
+    zones.push_back(logo_zone);
+
+    led logo_led;
+
+    logo_led.name          = "Logo LED";
+    logo_led.value         = 1;
+
+    leds.push_back(logo_led);
+
+    SetupColors();
+}
+
+void RGBController_StrixClaw::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+
+}
+
+void RGBController_StrixClaw::DeviceUpdateLEDs()
+{
+    
+}
+
+void RGBController_StrixClaw::UpdateZoneLEDs(int /*zone*/)
+{
+    
+}
+
+void RGBController_StrixClaw::UpdateSingleLED(int /*led*/)
+{
+    
+}
+
+void RGBController_StrixClaw::DeviceUpdateMode()
+{
+    if(modes[active_mode].value == 0)
+    {
+        controller->SetScrollWheelLED(false);
+        controller->SetLogoLED(0);
+
+    }
+    else if(modes[active_mode].value == 1)
+    {
+        controller->SetScrollWheelLED(true);
+        controller->SetLogoLED(255);
+    }
+}
+

Controllers/AsusLegacyUSBController/RGBController_AsusStrixClaw.h

@@ -0,0 +1,33 @@
+/*-----------------------------------------*\
+|  RGBController_AsusStrixClaw.h            |
+|                                           |
+|  Generic RGB Interface for Asus           |
+|  Legacy USB controller driver             |
+|                                           |
+|  Mola19 08/06/2022                        |
+\*-----------------------------------------*/
+
+#pragma once
+#include "RGBController.h"
+#include "AsusStrixClawController.h"
+
+
+class RGBController_StrixClaw : public RGBController
+{
+public:
+    RGBController_StrixClaw(StrixClawController* controller_ptr);
+    ~RGBController_StrixClaw();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+private:
+    StrixClawController*  controller;
+};

Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.cpp

@@ -12,6 +12,7 @@ using namespace std::chrono_literals;
 
 /**------------------------------------------------------------------*\
     @name Asus TUF Laptop
+    @category Keyboard
     @type WMI
     @save :x:
     @direct :white_check_mark:
@@ -140,11 +141,6 @@ void RGBController_AsusTUFLaptopWMI::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_AsusTUFLaptopWMI::SetCustomMode()
-{
-    SetMode(0);
-}
-
 void RGBController_AsusTUFLaptopWMI::DeviceUpdateMode()
 {
     DeviceUpdateLEDs();

Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.h

@@ -20,8 +20,6 @@ public:
     void UpdateSingleLED(int led) override;
 
     void DeviceUpdateMode() override;
-
-    void SetCustomMode() override;
 };
 
 #endif

Controllers/BlinkyTapeController/BlinkyTapeControllerDetect.cpp

@@ -34,3 +34,8 @@ void DetectBlinkyTapeControllers(std::vector<RGBController*> &rgb_controllers)
 }
 
 REGISTER_DETECTOR("BlinkyTape", DetectBlinkyTapeControllers);
+/*---------------------------------------------------------------------------------------------------------*\
+| Entries for dynamic UDEV rules                                                                            |
+|                                                                                                           |
+| DUMMY_DEVICE_DETECTOR("BlinkyTape", DetectBlinkyTapeControllers, 0x1D50, 0x605E )                         |
+\*---------------------------------------------------------------------------------------------------------*/

Controllers/BlinkyTapeController/RGBController_BlinkyTape.cpp

@@ -10,6 +10,7 @@
 
 /**------------------------------------------------------------------*\
     @name Blinky Tape
+    @category LEDStrip
     @type Serial
     @save :x:
     @direct :white_check_mark:
@@ -136,11 +137,6 @@ void RGBController_BlinkyTape::UpdateSingleLED(int /*led*/)
     controller->SetLEDs(colors);
 }
 
-void RGBController_BlinkyTape::SetCustomMode()
-{
-
-}
-
 void RGBController_BlinkyTape::DeviceUpdateMode()
 {
 

Controllers/BlinkyTapeController/RGBController_BlinkyTape.h

@@ -25,7 +25,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:

Controllers/CoolerMasterController/CMARGBGen2A1controller.cpp

@@ -0,0 +1,373 @@
+/*-------------------------------------------------------------------*\
+|  CMARGBGen2A1controller.cpp                                         |
+|                                                                     |
+|  Driver for Coolermaster ARGB Gen 2 A1 USB Controller               |
+|                                                                     |
+|  morg (Morgan Guimard) 6/26/2022                                    |
+|                                                                     |
+\*-------------------------------------------------------------------*/
+
+#include "CMARGBGen2A1controller.h"
+#include <cstring>
+
+CMARGBGen2A1controller::CMARGBGen2A1controller(hid_device* dev_handle, const hid_device_info& info)
+{
+    dev                 = dev_handle;
+    location            = info.path;
+
+    wchar_t serial_string[128];
+    int ret = hid_get_serial_number_string(dev, serial_string, 128);
+
+    if(ret != 0)
+    {
+        serial_number = "";
+    }
+    else
+    {
+        std::wstring return_wstring = serial_string;
+        serial_number = std::string(return_wstring.begin(), return_wstring.end());
+    }
+
+    /*---------------------------------------------*\
+    | Setup direct mode on start                    |
+    \*---------------------------------------------*/
+    SetupDirectMode();
+}
+
+CMARGBGen2A1controller::~CMARGBGen2A1controller()
+{
+    hid_close(dev);
+}
+
+std::string CMARGBGen2A1controller::GetDeviceLocation()
+{
+    return("HID: " + location);
+}
+
+std::string CMARGBGen2A1controller::GetSerialString()
+{
+    return(serial_number);
+}
+
+void CMARGBGen2A1controller::SaveToFlash()
+{
+    unsigned char usb_buf[CM_ARGB_GEN2_A1_PACKET_LENGTH];
+
+    memset(usb_buf, 0x00, CM_ARGB_GEN2_A1_PACKET_LENGTH);
+
+    usb_buf[1] = CM_ARGB_GEN2_A1_COMMAND;
+    usb_buf[2] = CM_ARGB_GEN2_A1_FLASH;
+    usb_buf[3] = CM_ARGB_GEN2_A1_WRITE;
+
+    hid_write(dev, usb_buf, CM_ARGB_GEN2_A1_PACKET_LENGTH);
+
+    std::this_thread::sleep_for(std::chrono::milliseconds(10));
+}
+
+void CMARGBGen2A1controller::SetupDirectMode()
+{
+    unsigned char usb_buf[CM_ARGB_GEN2_A1_PACKET_LENGTH];
+
+    /*---------------------------------------------*\
+    | Swith to direct mode                          |
+    \*---------------------------------------------*/
+    memset(usb_buf, 0x00, CM_ARGB_GEN2_A1_PACKET_LENGTH);
+
+    usb_buf[1] = CM_ARGB_GEN2_A1_COMMAND;
+    usb_buf[2] = CM_ARGB_GEN2_A1_LIGHTNING_CONTROL;
+    usb_buf[3] = CM_ARGB_GEN2_A1_WRITE;
+    usb_buf[4] = 0x01; // channel???
+
+    hid_write(dev, usb_buf, CM_ARGB_GEN2_A1_PACKET_LENGTH);
+
+    std::this_thread::sleep_for(std::chrono::milliseconds(10));
+
+    software_mode_activated = true;
+}
+
+void CMARGBGen2A1controller::SetupZoneSize(unsigned int zone_id, unsigned int size)
+{
+    /*---------------------------------------------*\
+    | Set the mode sequence to full static          |
+    | (01 for static)                               |
+    |                                               |
+    | This device stores 2 distinct values          |
+    | - effect speed                                |
+    | - approximated zone size                      |
+    |                                               |
+    | It's probably based on standard ARGB sizes    |
+    | Still, the 06 value has some mystery.         |
+    |                                               |
+    | ES= effect speed                              |
+    | LC= LEDs count                                |
+    |                                               |
+    | ES LC                                         |
+    | -----                                         |
+    | 0a 06                                         |
+    | 09 06                                         |
+    | 08 07                                         |
+    | 07 08                                         |
+    | 06 0a                                         |
+    | 05 0c                                         |
+    | 04 0f                                         |
+    | 03 14                                         |
+    | 02 1e                                         |
+    | 01 3c                                         |
+    \*---------------------------------------------*/
+
+    const unsigned char gaps[10] =
+    {
+        0x05, 0x06, 0x07, 0x08, 0x0A, 0x0C, 0x0F, 0x14, 0x1E, 0x3C
+    };
+
+    unsigned char speed = 0x0A;
+
+    for(unsigned int g = 0; g < 10; g++)
+    {
+        if(size <= gaps[g])
+        {
+            break;
+        }
+
+        speed--;
+    }
+
+    unsigned char usb_buf[CM_ARGB_GEN2_A1_PACKET_LENGTH];
+
+    memset(usb_buf, 0x00, CM_ARGB_GEN2_A1_PACKET_LENGTH);
+
+    usb_buf[1] = CM_ARGB_GEN2_A1_COMMAND;
+    usb_buf[2] = CM_ARGB_GEN2_A1_SIZES;
+    usb_buf[3] = CM_ARGB_GEN2_A1_WRITE;
+    usb_buf[4] = 1 << zone_id;
+
+    usb_buf[5] = speed;
+    usb_buf[6] = size;
+
+    hid_write(dev, usb_buf, CM_ARGB_GEN2_A1_PACKET_LENGTH);
+
+    std::this_thread::sleep_for(std::chrono::milliseconds(10));
+}
+
+void CMARGBGen2A1controller::SendDirectChannel(unsigned int zone_id, std::vector<RGBColor> colors)
+{
+    /*---------------------------------------------*\
+    | Create the color data array                   |
+    \*---------------------------------------------*/
+    std::vector<unsigned char> color_data = CreateColorData(colors);
+
+    std::vector<unsigned char>::iterator it = color_data.begin();
+
+    unsigned char usb_buf[CM_ARGB_GEN2_A1_PACKET_LENGTH];
+
+    unsigned int offset;
+
+    unsigned char packet_start[CM_ARGB_GEN2_A1_PACKETS_PER_CHANNEL] =
+    {
+        0x00, 0x01, 0x82
+    };
+
+    /*---------------------------------------------*\
+    | Send 3 packets for the zone                   |
+    \*---------------------------------------------*/
+    for(unsigned int p = 0; p < CM_ARGB_GEN2_A1_PACKETS_PER_CHANNEL; p++)
+    {
+        memset(usb_buf, 0x00, CM_ARGB_GEN2_A1_PACKET_LENGTH);
+
+        usb_buf[1] = packet_start[p];
+        usb_buf[2] = 0x09;
+
+        if(p == 0)
+        {
+            usb_buf[3] = 1 << zone_id;
+            usb_buf[5] = 0x3C;
+
+            offset = 6;
+        }
+        else
+        {
+            offset = 3;
+        }
+
+        while(offset < CM_ARGB_GEN2_A1_PACKET_LENGTH && it != color_data.end())
+        {
+            usb_buf[offset] = *it;
+            offset++;
+            it++;
+        }
+
+        hid_write(dev, usb_buf, CM_ARGB_GEN2_A1_PACKET_LENGTH);
+
+        /*---------------------------------------------*\
+        | This device needs some delay before we send   |
+        | any other packet                              |
+        \*---------------------------------------------*/
+        std::this_thread::sleep_for(std::chrono::milliseconds(1));
+    }
+
+    /*---------------------------------------------*\
+    | Next channel needs some delay as well         |
+    \*---------------------------------------------*/
+    std::this_thread::sleep_for(std::chrono::milliseconds(2));
+}
+
+void CMARGBGen2A1controller::SetMode(unsigned int mode_value, unsigned char speed, unsigned char brightness, RGBColor color, bool random)
+{
+    unsigned char usb_buf[CM_ARGB_GEN2_A1_PACKET_LENGTH];
+
+    /*---------------------------------------------*\
+    | Switch to hardware mode if needed             |
+    \*---------------------------------------------*/
+    if(software_mode_activated)
+    {
+        memset(usb_buf, 0x00, CM_ARGB_GEN2_A1_PACKET_LENGTH);
+
+        usb_buf[1] = CM_ARGB_GEN2_A1_COMMAND;
+        usb_buf[2] = CM_ARGB_GEN2_A1_LIGHTNING_CONTROL;
+        usb_buf[3] = CM_ARGB_GEN2_A1_WRITE;
+
+        hid_write(dev, usb_buf, CM_ARGB_GEN2_A1_PACKET_LENGTH);
+
+        software_mode_activated = false;
+
+        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+    }
+
+    /*---------------------------------------------*\
+    | Set the mode values and write to the device   |
+    \*---------------------------------------------*/
+    memset(usb_buf, 0x00, CM_ARGB_GEN2_A1_PACKET_LENGTH);
+
+    usb_buf[1] = CM_ARGB_GEN2_A1_COMMAND;
+    usb_buf[2] = CM_ARGB_GEN2_A1_HW_MODE_SETUP;
+    usb_buf[3] = CM_ARGB_GEN2_A1_WRITE;
+
+    usb_buf[4] = 0xFF;
+    usb_buf[5] = 0xFF;
+
+    usb_buf[6] = mode_value;
+
+    bool is_custom_mode = mode_value == CM_ARGB_GEN2_A1_CUSTOM_MODE;
+
+    if(is_custom_mode)
+    {
+        usb_buf[8] = 0xFF;
+    }
+    else
+    {
+        usb_buf[7]  = speed;
+        usb_buf[8]  = brightness;
+        usb_buf[9]  = RGBGetRValue(color);
+        usb_buf[10] = RGBGetGValue(color);
+        usb_buf[11] = RGBGetBValue(color);
+        usb_buf[12] = random;
+    }
+
+
+    hid_write(dev, usb_buf, CM_ARGB_GEN2_A1_PACKET_LENGTH);
+
+    std::this_thread::sleep_for(std::chrono::milliseconds(10));
+
+    if(is_custom_mode)
+    {
+        for(unsigned int channel = 0; channel < CM_ARGB_GEN2_A1_CHANNEL_COUNT; channel++)
+        {
+            SetCustomSequence(channel);
+        }
+    }
+}
+
+std::vector<unsigned char> CMARGBGen2A1controller::CreateColorData(std::vector<RGBColor> colors)
+{
+    std::vector<unsigned char> color_data;
+
+    for(unsigned int c = 0; c < colors.size(); c++)
+    {
+        color_data.push_back(RGBGetRValue(colors[c]));
+        color_data.push_back(RGBGetGValue(colors[c]));
+        color_data.push_back(RGBGetBValue(colors[c]));
+    }
+
+    return color_data;
+}
+
+
+void CMARGBGen2A1controller::SetCustomColors(unsigned int zone_id, std::vector<RGBColor> colors)
+{
+    unsigned char usb_buf[CM_ARGB_GEN2_A1_PACKET_LENGTH];
+
+    /*---------------------------------------------*\
+    | Create the color data array                   |
+    \*---------------------------------------------*/
+    std::vector<unsigned char> color_data = CreateColorData(colors);
+
+    std::vector<unsigned char>::iterator it = color_data.begin();
+
+    unsigned char packet_start[5] =
+    {
+        CM_ARGB_GEN2_A1_COMMAND, 0x00, 0x01, 0x02, 0x83
+    };
+
+    /*---------------------------------------------*\
+    | Send the 5 packets of colors                  |
+    \*---------------------------------------------*/
+    for(unsigned int p = 0; p < 5; p++)
+    {
+        memset(usb_buf, 0x00, CM_ARGB_GEN2_A1_PACKET_LENGTH);
+
+        usb_buf[1] = packet_start[p];
+
+        /*----------------------------------------------*\
+        | This part isnt well understood                 |
+        | 1st packet starts with CM_ARGB_GEN2_A1_COMMAND |
+        | Looks like it is a read command                |
+        \*----------------------------------------------*/
+        usb_buf[2] = p == 0 ? 0x06 : 0x08; // 0x08 custom data, 0x06 sizes?
+        usb_buf[3] = p == 0 ? 0x01 : 0x02; // read/write has no meaning here
+
+        usb_buf[4] = 1 << zone_id;
+
+        unsigned int offset = 6;
+
+        while(p > 0 && offset < CM_ARGB_GEN2_A1_PACKET_LENGTH && it != color_data.end())
+        {
+            usb_buf[offset] = *it;
+            offset++;
+            it++;
+        }
+
+        hid_write(dev, usb_buf, CM_ARGB_GEN2_A1_PACKET_LENGTH);
+
+        std::this_thread::sleep_for(std::chrono::milliseconds(20));
+    }
+
+}
+
+void CMARGBGen2A1controller::SetCustomSequence(unsigned int zone_id)
+{
+    unsigned char usb_buf[CM_ARGB_GEN2_A1_PACKET_LENGTH];
+
+    const unsigned char static_seq = 0x01;
+
+    /*---------------------------------------------*\
+    | Set the mode sequence to full static          |
+    | (01 for static)                               |
+    \*---------------------------------------------*/
+    memset(usb_buf, 0x00, CM_ARGB_GEN2_A1_PACKET_LENGTH);
+
+    usb_buf[1]  = CM_ARGB_GEN2_A1_COMMAND;
+    usb_buf[2]  = CM_ARGB_GEN2_A1_CUSTOM_SEQUENCES;
+    usb_buf[3]  = CM_ARGB_GEN2_A1_WRITE;
+    usb_buf[4]  = 1 << zone_id;
+
+    usb_buf[5]  = static_seq;
+    usb_buf[6]  = static_seq;
+    usb_buf[7]  = static_seq;
+    usb_buf[8]  = static_seq;
+    usb_buf[9]  = static_seq;
+    usb_buf[10] = static_seq;
+
+    hid_write(dev, usb_buf, CM_ARGB_GEN2_A1_PACKET_LENGTH);
+
+    std::this_thread::sleep_for(std::chrono::milliseconds(10));
+}

Controllers/CoolerMasterController/CMARGBGen2A1controller.h

@@ -0,0 +1,89 @@
+/*-------------------------------------------------------------------*\
+|  CMARGBGen2A1controller.h                                           |
+|                                                                     |
+|  Driver for Coolermaster ARGB Gen 2 A1 USB Controller               |
+|                                                                     |
+|  morg (Morgan Guimard) 6/26/2022                                    |
+|                                                                     |
+\*-------------------------------------------------------------------*/
+
+#include "RGBController.h"
+#include <string>
+#include <hidapi/hidapi.h>
+
+#pragma once
+
+#define CM_ARGB_GEN2_A1_PACKET_LENGTH 65
+#define CM_ARGB_GEN2_A1_CHANNEL_MAX_SIZE 48
+#define CM_ARGB_GEN2_A1_CHANNEL_COUNT 3
+#define CM_ARGB_GEN2_A1_PACKETS_PER_CHANNEL 3
+
+enum
+{
+    CM_ARGB_GEN2_A1_DIRECT_MODE         = 0xFF,
+    CM_ARGB_GEN2_A1_SPECTRUM_MODE       = 0x00,
+    CM_ARGB_GEN2_A1_STATIC_MODE         = 0x01,
+    CM_ARGB_GEN2_A1_RELOAD_MODE         = 0x02,
+    CM_ARGB_GEN2_A1_RECOIL_MODE         = 0x03,
+    CM_ARGB_GEN2_A1_BREATHING_MODE      = 0x04,
+    CM_ARGB_GEN2_A1_REFILL_MODE         = 0x05,
+    CM_ARGB_GEN2_A1_DEMO_MODE           = 0x06,
+    CM_ARGB_GEN2_A1_FILL_FLOW_MODE      = 0x07,
+    CM_ARGB_GEN2_A1_RAINBOW_MODE        = 0x08,
+    CM_ARGB_GEN2_A1_CUSTOM_MODE         = 0xC0,
+    CM_ARGB_GEN2_A1_OFF_MODE            = 0x09
+};
+
+enum
+{
+    CM_ARGB_GEN2_A1_BRIGHTNESS_MAX      = 0xFF,
+    CM_ARGB_GEN2_A1_BRIGHTNESS_MIN      = 0x00,
+    CM_ARGB_GEN2_A1_SPEED_MAX           = 0x04,
+    CM_ARGB_GEN2_A1_SPEED_MIN           = 0x00,
+};
+
+enum
+{
+    CM_ARGB_GEN2_A1_COMMAND             = 0x80,
+    CM_ARGB_GEN2_A1_READ                = 0x01,
+    CM_ARGB_GEN2_A1_WRITE               = 0x02,
+    CM_ARGB_GEN2_A1_RESPONSE            = 0x03
+};
+
+enum
+{
+    CM_ARGB_GEN2_A1_SIZES               = 0x06,
+    CM_ARGB_GEN2_A1_FLASH               = 0x0B,
+    CM_ARGB_GEN2_A1_IDENTIFY            = 0x0A,
+    CM_ARGB_GEN2_A1_LIGHTNING_CONTROL   = 0x01,
+    CM_ARGB_GEN2_A1_HW_MODE_SETUP       = 0x03,
+    CM_ARGB_GEN2_A1_CUSTOM_SEQUENCES    = 0x10,
+    CM_ARGB_GEN2_A1_CUSTOM_SPEED        = 0x11
+
+};
+
+class CMARGBGen2A1controller
+{
+public:
+    CMARGBGen2A1controller(hid_device* dev_handle, const hid_device_info& info);
+    ~CMARGBGen2A1controller();
+
+    std::string                 GetSerialString();
+    std::string                 GetDeviceLocation();
+
+    void                        SendDirectChannel(unsigned int zone_id, std::vector<RGBColor> colors);
+    void                        SetupZoneSize(unsigned int zone_id, unsigned int size);
+    void                        SetupDirectMode();
+    void                        SetMode(unsigned int mode_value, unsigned char speed, unsigned char brightness, RGBColor color, bool random);
+    void                        SetCustomColors(unsigned int zone_id, std::vector<RGBColor> colors);
+    void                        SaveToFlash();
+
+private:
+    std::string                 serial_number;
+    std::string                 location;
+    bool                        software_mode_activated = false;
+    hid_device*                 dev;
+
+    void                        SetCustomSequence(unsigned int zone_id);
+    std::vector<unsigned char>  CreateColorData(std::vector<RGBColor> colors);
+};

Controllers/CoolerMasterController/CMMMController.h

@@ -28,6 +28,7 @@ enum
     CM_MM531_PID                 = 0x0097,
     CM_MM711_PID                 = 0x0101,
     CM_MM720_PID                 = 0x0141,
+    CM_MM730_PID                 = 0x0165,
 };
 
 enum

Controllers/CoolerMasterController/CMR6000Controller.cpp

@@ -9,10 +9,11 @@
 #include "CMR6000Controller.h"
 #include <cstring>
 
-CMR6000Controller::CMR6000Controller(hid_device* dev_handle, char *_path)
+CMR6000Controller::CMR6000Controller(hid_device* dev_handle, char *_path, uint16_t _pid)
 {
     dev             = dev_handle;
     location        = _path;
+    pid             = _pid;
 
     const int szTemp = 256;
     wchar_t tmpName[szTemp];
@@ -59,21 +60,6 @@ unsigned char CMR6000Controller::GetMode()
     return current_mode;
 }
 
-unsigned char CMR6000Controller::GetLedRed()
-{
-    return current_red;
-}
-
-unsigned char CMR6000Controller::GetLedGreen()
-{
-    return current_green;
-}
-
-unsigned char CMR6000Controller::GetLedBlue()
-{
-    return current_blue;
-}
-
 unsigned char CMR6000Controller::GetLedSpeed()
 {
     return current_speed;
@@ -89,13 +75,17 @@ bool CMR6000Controller::GetRandomColours()
     return current_random;
 }
 
-void CMR6000Controller::SetMode(unsigned char mode, unsigned char speed, unsigned char red, unsigned char green, unsigned char blue, unsigned char random, unsigned char brightness)
+uint16_t CMR6000Controller::GetPID()
+{
+    return pid;
+}
+
+void CMR6000Controller::SetMode(unsigned char mode, unsigned char speed, RGBColor color1, RGBColor color2, unsigned char random, unsigned char brightness)
 {
     current_mode        = mode;
     current_speed       = speed;
-    current_red         = red;
-    current_green       = green;
-    current_blue        = blue;
+    primary             = color1;
+    secondary           = color2;
     current_random      = random;
     current_brightness  = brightness;
 
@@ -103,7 +93,7 @@ void CMR6000Controller::SetMode(unsigned char mode, unsigned char speed, unsigne
 }
 
 void CMR6000Controller::SendUpdate()
-{    
+{
     if(current_mode == CM_MR6000_MODE_OFF)
     {
         unsigned char buffer[CM_6K_PACKET_SIZE] = { 0x00, 0x41, 0x43 };
@@ -114,6 +104,11 @@ void CMR6000Controller::SendUpdate()
     {
         SendEnableCommand();
 
+        if(pid == COOLERMASTER_RADEON_6900_PID)
+        {
+            SendSecondColour();
+        }
+
         unsigned char buffer[CM_6K_PACKET_SIZE] = { 0x00 };
         int buffer_size = (sizeof(buffer) / sizeof(buffer[0]));
         memset(buffer, 0xFF, buffer_size);
@@ -124,18 +119,39 @@ void CMR6000Controller::SendUpdate()
         buffer[0x03] = 0x01;
         buffer[0x04] = 0x00;
         buffer[0x05] = current_mode;
-        buffer[0x06] = (current_mode == CM_MR6000_MODE_DIRECT) ? 0xFF: current_speed;
-        buffer[0x07] = (current_mode == CM_MR6000_MODE_BREATHE)? current_random : 0x00; //random (A0)
-        buffer[0x08] = (current_mode == CM_MR6000_MODE_BREATHE)? 0x03 : 0xFF;
+        buffer[0x06] = current_speed;
+        buffer[0x07] = current_random; //random (A0)
         //buffer[0x09] = 0xFF;
         buffer[0x0A] = current_brightness;
-        buffer[0x0B] = (current_mode == CM_MR6000_MODE_COLOR_CYCLE) ? 0xFF : current_red;
-        buffer[0x0C] = (current_mode == CM_MR6000_MODE_COLOR_CYCLE) ? 0xFF : current_green;
-        buffer[0x0D] = (current_mode == CM_MR6000_MODE_COLOR_CYCLE) ? 0xFF : current_blue;
+        buffer[0x0B] = (current_mode == CM_MR6000_MODE_COLOR_CYCLE) ? 0xFF : RGBGetRValue(primary);
+        buffer[0x0C] = (current_mode == CM_MR6000_MODE_COLOR_CYCLE) ? 0xFF : RGBGetGValue(primary);
+        buffer[0x0D] = (current_mode == CM_MR6000_MODE_COLOR_CYCLE) ? 0xFF : RGBGetBValue(primary);
         buffer[0x0E] = 0x00;
         buffer[0x0F] = 0x00;
         buffer[0x10] = 0x00;
 
+        /*-----------------------------------------------------------------*\
+        | Index 0x08 looks to be mode specific flags / options              |
+        \*-----------------------------------------------------------------*/
+        switch(current_mode)
+        {
+            case CM_MR6000_MODE_BREATHE:
+                buffer[0x08] = 0x03;
+                break;
+            case CM_MR6000_MODE_RAINBOW:
+                buffer[0x08] = 0x05;
+                break;
+            case CM_MR6000_MODE_CHASE:
+                buffer[0x08] = 0xC3;
+                break;
+            case CM_MR6000_MODE_SWIRL:
+                buffer[0x08] = 0x4A;
+                break;
+            default:
+                buffer[0x08] = 0xFF;
+        }
+
+
         hid_write(dev, buffer, buffer_size);
 
         SendColourConfig();
@@ -174,3 +190,18 @@ void CMR6000Controller::SendColourConfig()
     hid_write(dev, buffer, buffer_size);
     hid_read_timeout(dev, buffer, buffer_size, CM_6K_INTERRUPT_TIMEOUT);
 }
+
+void CMR6000Controller::SendSecondColour()
+{
+    unsigned char buffer[CM_6K_PACKET_SIZE] = { 0x00, 0x51, 0x9C, 0x01, 0x00 };
+
+    buffer[5]   = RGBGetRValue(primary);
+    buffer[6]   = RGBGetGValue(primary);
+    buffer[7]   = RGBGetBValue(primary);
+    buffer[8]   = RGBGetRValue(secondary);
+    buffer[9]   = RGBGetGValue(secondary);
+    buffer[10]  = RGBGetBValue(secondary);
+
+    hid_write(dev, buffer, CM_6K_PACKET_SIZE);
+    hid_read_timeout(dev, buffer, CM_6K_PACKET_SIZE, CM_6K_INTERRUPT_TIMEOUT);
+}

Controllers/CoolerMasterController/CMR6000Controller.h

@@ -9,21 +9,31 @@
 #include <string>
 #include <array>
 #include <hidapi/hidapi.h>
+#include "RGBController.h"
 
 #pragma once
 
-#define CM_6K_PACKET_SIZE       65  //Includes extra first byte for non HID Report packets
-#define CM_6K_INTERRUPT_TIMEOUT 250
-#define CM_6K_DEVICE_NAME_SIZE  (sizeof(device_name) / sizeof(device_name[ 0 ]))
-#define CM_6K_SERIAL_SIZE       (sizeof(serial) / sizeof(serial[ 0 ]))
-#define HID_MAX_STR             255
+#define COOLERMASTER_RADEON_6000_PID            0x014D
+#define COOLERMASTER_RADEON_6900_PID            0x015B
+
+#define CM_6K_PACKET_SIZE           65  //Includes extra first byte for non HID Report packets
+#define CM_6K_INTERRUPT_TIMEOUT     250
+#define CM_6K_DEVICE_NAME_SIZE      (sizeof(device_name) / sizeof(device_name[ 0 ]))
+#define CM_6K_SERIAL_SIZE           (sizeof(serial) / sizeof(serial[ 0 ]))
+#define HID_MAX_STR                 255
 
 enum
 {
-    CM_MR6000_MODE_DIRECT        = 0x00, //Direct Mode
-    CM_MR6000_MODE_BREATHE       = 0x01, //Breathe Mode
-    CM_MR6000_MODE_COLOR_CYCLE   = 0x02, //Color cycle
-    CM_MR6000_MODE_OFF           = 0xFF, //Off
+    CM_MR6000_MODE_DIRECT           = 0x00, //Direct Mode
+    CM_MR6000_MODE_BREATHE          = 0x01, //Breathe Mode
+    CM_MR6000_MODE_COLOR_CYCLE      = 0x02, //Color cycle
+
+    CM_MR6000_MODE_RAINBOW          = 0x07, //Rainbow
+    CM_MR6000_MODE_BOUNCE           = 0x08, //Bounce
+    CM_MR6000_MODE_CHASE            = 0x09, //Chase
+    CM_MR6000_MODE_SWIRL            = 0x0A, //Swirl
+
+    CM_MR6000_MODE_OFF              = 0xFF, //Off
 };
 
 enum
@@ -34,6 +44,10 @@ enum
     MR6000_CYCLE_SPEED_FAST                 = 0x6E, /* Fast speed                   */
     MR6000_CYCLE_SPEED_FASTEST              = 0x68, /* Fastest speed                */
 
+    MR6000_RAINBOW_SPEED_SLOWEST            = 0x78, /* Slowest speed                */
+    MR6000_RAINBOW_SPEED_NORMAL             = 0x6B, /* Normal speed                */
+    MR6000_RAINBOW_SPEED_FASTEST            = 0x60, /* Fastest speed                */
+
     MR6000_BREATHE_SPEED_SLOWEST            = 0x3C, /* Slowest speed                */
     MR6000_BREATHE_SPEED_SLOW               = 0x37, /* Slow speed                   */
     MR6000_BREATHE_SPEED_NORMAL             = 0x31, /* Normal speed                 */
@@ -44,39 +58,39 @@ enum
 class CMR6000Controller
 {
 public:
-    CMR6000Controller(hid_device* dev_handle, char *_path);
+    CMR6000Controller(hid_device* dev_handle, char *_path, uint16_t _pid);
     ~CMR6000Controller();
 
-    std::string   GetDeviceName();
-    std::string   GetSerial();
-    std::string   GetLocation();
+    std::string     GetDeviceName();
+    std::string     GetSerial();
+    std::string     GetLocation();
 
-    unsigned char GetMode();
-    unsigned char GetLedRed();
-    unsigned char GetLedGreen();
-    unsigned char GetLedBlue();
-    unsigned char GetLedSpeed();
-    unsigned char GetBrightness();
-    bool          GetRandomColours();
-    void          SetMode(unsigned char mode, unsigned char speed, unsigned char red, unsigned char green, unsigned char blue, unsigned char random, unsigned char brightness);
+    unsigned char   GetMode();
+    unsigned char   GetLedSpeed();
+    unsigned char   GetBrightness();
+    bool            GetRandomColours();
+    uint16_t        GetPID();
+
+    void            SetMode(unsigned char mode, unsigned char speed, RGBColor color1, RGBColor color2, unsigned char random, unsigned char brightness);
 
 private:
-    std::string             device_name;
-    std::string             serial;
-    std::string             location;
-    hid_device*             dev;
+    std::string     device_name;
+    std::string     serial;
+    std::string     location;
+    hid_device*     dev;
+    uint16_t        pid;
 
-    unsigned char           current_mode;
-    unsigned char           current_speed;
-    unsigned char           current_random;
+    unsigned char   current_mode;
+    unsigned char   current_speed;
+    unsigned char   current_random;
 
-    unsigned char           current_red;
-    unsigned char           current_green;
-    unsigned char           current_blue;
-    unsigned char           current_brightness;
+    unsigned char   current_brightness;
+    RGBColor        primary;
+    RGBColor        secondary;
 
-    void SendUpdate();
-    void SendEnableCommand();
-    void SendApplyCommand();
-    void SendColourConfig();
+    void            SendUpdate();
+    void            SendEnableCommand();
+    void            SendApplyCommand();
+    void            SendColourConfig();
+    void            SendSecondColour();
 };

Controllers/CoolerMasterController/CMSmallARGBController.cpp

@@ -12,6 +12,11 @@
 #include "CMSmallARGBController.h"
 #include <cstring>
 
+cm_small_argb_headers cm_small_argb_header_data[1] =
+{
+    { "CM Small ARGB",  0x01, true,  12 }
+};
+
 CMSmallARGBController::CMSmallARGBController(hid_device* dev_handle, char *_path, unsigned char _zone_idx)
 {
     const int szTemp = 256;
@@ -215,7 +220,7 @@ void CMSmallARGBController::SendUpdate()
 
     buffer[CM_SMALL_ARGB_COMMAND_BYTE]                  = 0x0b;
     buffer[CM_SMALL_ARGB_FUNCTION_BYTE]                 = (false) ? 0x01 : 0x02; //This controls custom mode TODO
-    buffer[CM_SMALL_ARGB_ZONE_BYTE]                     = small_argb_header_data[zone_index].header;
+    buffer[CM_SMALL_ARGB_ZONE_BYTE]                     = cm_small_argb_header_data[zone_index].header;
     buffer[CM_SMALL_ARGB_MODE_BYTE]                     = current_mode;
     buffer[CM_SMALL_ARGB_SPEED_BYTE]                    = current_speed;
     buffer[CM_SMALL_ARGB_COLOUR_INDEX_BYTE]             = (bool_random) ? 0x00 : 0x10; //This looks to still be the colour index and controls random colours

Controllers/CoolerMasterController/CMSmallARGBController.h

@@ -34,7 +34,7 @@ enum
     CM_SMALL_ARGB_BLUE_BYTE             = 11,
 };
 
-struct _argb_headers
+struct cm_small_argb_headers
 {
     const char*     name;
     unsigned char   header;
@@ -42,10 +42,7 @@ struct _argb_headers
     unsigned int    count;
 };
 
-static _argb_headers small_argb_header_data[1] =
-{
-    { "CM Small ARGB",  0x01, true,  12 }
-};
+extern cm_small_argb_headers cm_small_argb_header_data[1];
 
 enum
 {

Controllers/CoolerMasterController/CoolerMasterControllerDetect.cpp

@@ -1,41 +1,67 @@
+/*-----------------------------------------------------*\
+| OpenRGB includes                                      |
+\*-----------------------------------------------------*/
+#include <hidapi/hidapi.h>
 #include "Detector.h"
-#include "CMMM711Controller.h"
-#include "CMMP750Controller.h"
-#include "CMARGBcontroller.h"
-#include "CMSmallARGBController.h"
-#include "CMRGBController.h"
-#include "CMR6000Controller.h"
-#include "CMMKController.h"
+#include "LogManager.h"
 #include "RGBController.h"
+
+/*-----------------------------------------------------*\
+| Coolermaster specific includes                        |
+\*-----------------------------------------------------*/
 #include "RGBController_CMMMController.h"
 #include "RGBController_CMMM711Controller.h"
 #include "RGBController_CMMP750Controller.h"
 #include "RGBController_CMARGBController.h"
 #include "RGBController_CMSmallARGBController.h"
+#include "RGBController_CMARGBGen2A1Controller.h"
 #include "RGBController_CMRGBController.h"
 #include "RGBController_CMR6000Controller.h"
 #include "RGBController_CMMKController.h"
-#include <hidapi/hidapi.h>
 
-#define COOLERMASTER_VID                        0x2516
+/*-----------------------------------------------------*\
+| Coolermaster USB vendor ID                            |
+\*-----------------------------------------------------*/
+#define COOLERMASTER_VID                            0x2516
 
-#define COOLERMASTER_MM530_PID                  0x0065
-#define COOLERMASTER_MM531_PID                  0x0097
-#define COOLERMASTER_MM711_PID                  0x0101
-#define COOLERMASTER_MM720_PID                  0x0141
-#define COOLERMASTER_MP750_XL_PID               0x0109
-#define COOLERMASTER_MP750_L_PID                0x0107
-#define COOLERMASTER_MP750_MEDIUM_PID           0x0105
-#define COOLERMASTER_ARGB_PID                   0x1011
-#define COOLERMASTER_SMALL_ARGB_PID             0x1000
-#define COOLERMASTER_RGB_PID                    0x004F
-#define COOLERMASTER_RADEON_6000_PID            0x014D
-#define COOLERMASTER_MASTERKEYS_PRO_L_PID       0x003B
-#define COOLERMASTER_MASTERKEYS_PRO_L_WHITE_PID 0x0047
-#define COOLERMASTER_MASTERKEYS_PRO_S_PID       0x003C
-#define COOLERMASTER_MASTERKEYS_MK750_PID       0x0067
-#define COOLERMASTER_MASTERKEYS_SK630_PID       0x0089
-#define COOLERMASTER_MASTERKEYS_SK650_PID       0x008D
+/*-----------------------------------------------------*\
+| Coolermaster Keyboards                                |
+\*-----------------------------------------------------*/
+#define COOLERMASTER_MASTERKEYS_PRO_L_PID           0x003B
+#define COOLERMASTER_MASTERKEYS_PRO_L_WHITE_PID     0x0047
+#define COOLERMASTER_MASTERKEYS_PRO_S_PID           0x003C
+#define COOLERMASTER_MASTERKEYS_MK750_PID           0x0067
+#define COOLERMASTER_MASTERKEYS_SK630_PID           0x0089
+#define COOLERMASTER_MASTERKEYS_SK650_PID           0x008D
+
+/*-----------------------------------------------------*\
+| Coolermaster GPUs                                     |
+|   PIDs defined in `CMR6000Controller.h`               |
+\*-----------------------------------------------------*/
+
+/*-----------------------------------------------------*\
+| Coolermaster LEDstrip controllers                     |
+\*-----------------------------------------------------*/
+#define COOLERMASTER_ARGB_PID                       0x1011
+#define COOLERMASTER_ARGB_GEN2_A1_PID               0x0173
+#define COOLERMASTER_SMALL_ARGB_PID                 0x1000
+#define COOLERMASTER_RGB_PID                        0x004F
+
+/*-----------------------------------------------------*\
+| Coolermaster Mice                                     |
+\*-----------------------------------------------------*/
+#define COOLERMASTER_MM530_PID                      0x0065
+#define COOLERMASTER_MM531_PID                      0x0097
+#define COOLERMASTER_MM711_PID                      0x0101
+#define COOLERMASTER_MM720_PID                      0x0141
+#define COOLERMASTER_MM730_PID                      0x0165
+
+/*-----------------------------------------------------*\
+| Coolermaster Mousemats                                |
+\*-----------------------------------------------------*/
+#define COOLERMASTER_MP750_XL_PID                   0x0109
+#define COOLERMASTER_MP750_L_PID                    0x0107
+#define COOLERMASTER_MP750_MEDIUM_PID               0x0105
 
 /******************************************************************************************\
 *                                                                                          *
@@ -67,13 +93,26 @@ void DetectCoolerMasterARGB(hid_device_info* info, const std::string&)
     }
 }
 
+void DetectCoolerMasterARGBGen2A1(hid_device_info* info, const std::string&)
+{
+    hid_device* dev = hid_open_path(info->path);
+
+    if(dev)
+    {
+        CMARGBGen2A1controller*               controller     = new CMARGBGen2A1controller(dev, *info);
+        RGBController_CMARGBGen2A1Controller* rgb_controller = new RGBController_CMARGBGen2A1Controller(controller);
+        // Constructor sets the name
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
+    }
+}
+
 void DetectCoolerMasterGPU(hid_device_info* info, const std::string&)
 {
     hid_device* dev = hid_open_path(info->path);
 
     if(dev)
     {
-        CMR6000Controller*               controller     = new CMR6000Controller(dev, info->path);
+        CMR6000Controller*               controller     = new CMR6000Controller(dev, info->path, info->product_id);
         RGBController_CMR6000Controller* rgb_controller = new RGBController_CMR6000Controller(controller);
         // Constructor sets the name
         ResourceManager::get()->RegisterRGBController(rgb_controller);
@@ -99,21 +138,32 @@ void DetectCoolerMasterMouse(hid_device_info* info, const std::string& name)
 
     if(dev)
     {
-        if(info->product_id == COOLERMASTER_MM530_PID || info->product_id == COOLERMASTER_MM531_PID)
+        switch(info->product_id)
         {
-            CMMMController* controller                      = new CMMMController(dev, info->path, info->product_id);
-            RGBController_CMMMController* rgb_controller    = new RGBController_CMMMController(controller);
-            rgb_controller->name                            = name;
-            ResourceManager::get()->RegisterRGBController(rgb_controller);
-        }
-        else if(info->product_id == COOLERMASTER_MM711_PID)
-        {
-            CMMM711Controller*               controller     = new CMMM711Controller(dev, info->path);
-            RGBController_CMMM711Controller* rgb_controller = new RGBController_CMMM711Controller(controller);
-            // Constructor sets the name
-            ResourceManager::get()->RegisterRGBController(rgb_controller);
-        }
+            case COOLERMASTER_MM530_PID:
+            case COOLERMASTER_MM531_PID:
+            case COOLERMASTER_MM720_PID:
+            case COOLERMASTER_MM730_PID:
+                {
+                    CMMMController*               controller        = new CMMMController(dev, info->path, info->product_id);
+                    RGBController_CMMMController* rgb_controller    = new RGBController_CMMMController(controller);
+                    rgb_controller->name                            = name;
+                    ResourceManager::get()->RegisterRGBController(rgb_controller);
+                }
+                break;
 
+            case COOLERMASTER_MM711_PID:
+                {
+                    CMMM711Controller*               controller     = new CMMM711Controller(dev, info->path);
+                    RGBController_CMMM711Controller* rgb_controller = new RGBController_CMMM711Controller(controller);
+                    // Constructor sets the name
+                    ResourceManager::get()->RegisterRGBController(rgb_controller);
+                }
+                break;
+
+            default:
+                LOG_DEBUG("[%s] Controller not created as the product ID %04X is missing from detector switch", name.c_str(), info->product_id);
+         }
     }
 }
 
@@ -156,20 +206,43 @@ void DetectCoolerMasterSmallARGB(hid_device_info* info, const std::string&)
     }
 }
 
-REGISTER_HID_DETECTOR_IPU("Cooler Master MM530",                    DetectCoolerMasterMouse,        COOLERMASTER_VID,   COOLERMASTER_MM530_PID,                     1,      0xFF00, 1);
-//REGISTER_HID_DETECTOR_IPU("Cooler Master MM531",                  DetectCoolerMasterMouse,        COOLERMASTER_VID,   COOLERMASTER_MM531_PID,                     1,      0xFF00, 1);
-REGISTER_HID_DETECTOR_IPU("Cooler Master MM711",                    DetectCoolerMasterMouse,        COOLERMASTER_VID,   COOLERMASTER_MM711_PID,                     1,      0xFF00, 1);
-REGISTER_HID_DETECTOR_IPU("Cooler Master MM720",                    DetectCoolerMasterMouse,        COOLERMASTER_VID,   COOLERMASTER_MM720_PID,                     1,      0xFF00, 1);
-REGISTER_HID_DETECTOR_PU ("Cooler Master MP750 XL",                 DetectCoolerMasterMousemats,    COOLERMASTER_VID,   COOLERMASTER_MP750_XL_PID,                          0xFF00, 1);
-REGISTER_HID_DETECTOR_PU ("Cooler Master MP750 Large",              DetectCoolerMasterMousemats,    COOLERMASTER_VID,   COOLERMASTER_MP750_L_PID,                           0xFF00, 1);
-REGISTER_HID_DETECTOR_PU ("Cooler Master MP750 Medium",             DetectCoolerMasterMousemats,    COOLERMASTER_VID,   COOLERMASTER_MP750_MEDIUM_PID,                      0xFF00, 1);
+/*-----------------------------------------------------*\
+| Coolermaster Keyboards                                |
+\*-----------------------------------------------------*/
 REGISTER_HID_DETECTOR_IPU("Cooler Master MasterKeys Pro L",         DetectCoolerMasterKeyboards,    COOLERMASTER_VID,   COOLERMASTER_MASTERKEYS_PRO_L_PID,          1,      0xFF00, 1);
 REGISTER_HID_DETECTOR_IPU("Cooler Master MasterKeys Pro L White",   DetectCoolerMasterKeyboards,    COOLERMASTER_VID,   COOLERMASTER_MASTERKEYS_PRO_L_WHITE_PID,    1,      0xFF00, 1);
 REGISTER_HID_DETECTOR_IPU("Cooler Master MasterKeys Pro S",         DetectCoolerMasterKeyboards,    COOLERMASTER_VID,   COOLERMASTER_MASTERKEYS_PRO_S_PID,          1,      0xFF00, 1);
 REGISTER_HID_DETECTOR_IPU("Cooler Master MK570",                    DetectCoolerMasterKeyboards,    COOLERMASTER_VID,   COOLERMASTER_MASTERKEYS_MK750_PID,          1,      0xFF00, 1);
 REGISTER_HID_DETECTOR_IPU("Cooler Master SK630",                    DetectCoolerMasterKeyboards,    COOLERMASTER_VID,   COOLERMASTER_MASTERKEYS_SK630_PID,          1,      0xFF00, 1);
 REGISTER_HID_DETECTOR_IPU("Cooler Master SK650",                    DetectCoolerMasterKeyboards,    COOLERMASTER_VID,   COOLERMASTER_MASTERKEYS_SK650_PID,          1,      0xFF00, 1);
+
+/*-----------------------------------------------------*\
+| Coolermaster LEDstrip controllers                     |
+\*-----------------------------------------------------*/
 REGISTER_HID_DETECTOR_IPU("Cooler Master ARGB",                     DetectCoolerMasterARGB,         COOLERMASTER_VID,   COOLERMASTER_ARGB_PID,                      0,      0xFF00, 1);
-REGISTER_HID_DETECTOR_IPU("Cooler Master Small ARGB",               DetectCoolerMasterSmallARGB,    COOLERMASTER_VID,   COOLERMASTER_SMALL_ARGB_PID,                0,      0xFF00, 1);
+REGISTER_HID_DETECTOR_IPU("Cooler Master ARGB Gen 2 A1",            DetectCoolerMasterARGBGen2A1,   COOLERMASTER_VID,   COOLERMASTER_ARGB_GEN2_A1_PID,              1,      0xFF01, 1);
 REGISTER_HID_DETECTOR_IPU("Cooler Master RGB",                      DetectCoolerMasterRGB,          COOLERMASTER_VID,   COOLERMASTER_RGB_PID,                       1,      0xFF00, 1);
+REGISTER_HID_DETECTOR_IPU("Cooler Master Small ARGB",               DetectCoolerMasterSmallARGB,    COOLERMASTER_VID,   COOLERMASTER_SMALL_ARGB_PID,                0,      0xFF00, 1);
+
+/*-----------------------------------------------------*\
+| Coolermaster Mice                                     |
+\*-----------------------------------------------------*/
+REGISTER_HID_DETECTOR_IPU("Cooler Master MM530",                    DetectCoolerMasterMouse,        COOLERMASTER_VID,   COOLERMASTER_MM530_PID,                     1,      0xFF00, 1);
+//REGISTER_HID_DETECTOR_IPU("Cooler Master MM531",                  DetectCoolerMasterMouse,        COOLERMASTER_VID,   COOLERMASTER_MM531_PID,                     1,      0xFF00, 1);
+REGISTER_HID_DETECTOR_IPU("Cooler Master MM711",                    DetectCoolerMasterMouse,        COOLERMASTER_VID,   COOLERMASTER_MM711_PID,                     1,      0xFF00, 1);
+REGISTER_HID_DETECTOR_IPU("Cooler Master MM720",                    DetectCoolerMasterMouse,        COOLERMASTER_VID,   COOLERMASTER_MM720_PID,                     1,      0xFF00, 1);
+REGISTER_HID_DETECTOR_IPU("Cooler Master MM730",                    DetectCoolerMasterMouse,        COOLERMASTER_VID,   COOLERMASTER_MM730_PID,                     1,      0xFF00, 1);
+
+/*-----------------------------------------------------*\
+| Coolermaster Mousemats                                |
+\*-----------------------------------------------------*/
+REGISTER_HID_DETECTOR_PU ("Cooler Master MP750 XL",                 DetectCoolerMasterMousemats,    COOLERMASTER_VID,   COOLERMASTER_MP750_XL_PID,                          0xFF00, 1);
+REGISTER_HID_DETECTOR_PU ("Cooler Master MP750 Large",              DetectCoolerMasterMousemats,    COOLERMASTER_VID,   COOLERMASTER_MP750_L_PID,                           0xFF00, 1);
+REGISTER_HID_DETECTOR_PU ("Cooler Master MP750 Medium",             DetectCoolerMasterMousemats,    COOLERMASTER_VID,   COOLERMASTER_MP750_MEDIUM_PID,                      0xFF00, 1);
+
+/*-----------------------------------------------------*\
+| Coolermaster GPUs                                     |
+|   PIDs defined in `CMR6000Controller.h`               |
+\*-----------------------------------------------------*/
 REGISTER_HID_DETECTOR_I  ("Cooler Master Radeon 6000 GPU",          DetectCoolerMasterGPU,          COOLERMASTER_VID,   COOLERMASTER_RADEON_6000_PID,               1                );
+REGISTER_HID_DETECTOR_I  ("Cooler Master Radeon 6900 GPU",          DetectCoolerMasterGPU,          COOLERMASTER_VID,   COOLERMASTER_RADEON_6900_PID,               1                );

Controllers/CoolerMasterController/RGBController_CMARGBController.cpp

@@ -11,8 +11,9 @@
 
 /**------------------------------------------------------------------*\
     @name Coolermaster ARGB
+    @category LEDStrip
     @type USB
-    @save :warning:
+    @save :robot:
     @direct :white_check_mark:
     @effects :white_check_mark:
     @detectors DetectCoolerMasterARGB

Controllers/CoolerMasterController/RGBController_CMARGBGen2A1Controller.cpp

@@ -0,0 +1,305 @@
+/*-------------------------------------------------------------------*\
+|  RGBController_CMARGBGen2A1Controller.cpp                           |
+|                                                                     |
+|  Driver for Coolermaster ARGB Gen 2 A1 USB Controller               |
+|                                                                     |
+|  morg (Morgan Guimard) 6/26/2022                                    |
+|                                                                     |
+\*-------------------------------------------------------------------*/
+
+#include "RGBController_CMARGBGen2A1Controller.h"
+
+#include <thread>
+#include <chrono>
+
+/**------------------------------------------------------------------*\
+    @name Coolermaster ARGB A1
+    @category LEDStrip
+    @type USB
+    @save :white_check_mark:
+    @direct :white_check_mark:
+    @effects :white_check_mark:
+    @detectors DetectCoolerMasterARGBGen2A1
+    @comment This device does not have Gen 2 support in OpenRGB yet.
+
+    Gen2 has auto-resize feature and parallel to serial magical stuff.<
+\*-------------------------------------------------------------------*/
+
+RGBController_CMARGBGen2A1Controller::RGBController_CMARGBGen2A1Controller(CMARGBGen2A1controller* controller_ptr)
+{
+    controller                  = controller_ptr;
+    name                        = "CoolerMaster LED Controller A1";
+    vendor                      = "CoolerMaster";
+    type                        = DEVICE_TYPE_LEDSTRIP;
+    description                 = name;
+    location                    = controller->GetDeviceLocation();
+    serial                      = controller->GetSerialString();
+    version                     = "";
+
+    mode Direct;
+    Direct.name                 = "Direct";
+    Direct.value                = CM_ARGB_GEN2_A1_DIRECT_MODE;
+    Direct.flags                = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode           = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
+    mode Spectrum;
+    Spectrum.name               = "Spectrum";
+    Spectrum.value              = CM_ARGB_GEN2_A1_SPECTRUM_MODE;
+    Spectrum.flags              = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_MANUAL_SAVE;
+    Spectrum.color_mode         = MODE_COLORS_NONE;
+    Spectrum.brightness         = CM_ARGB_GEN2_A1_BRIGHTNESS_MAX;
+    Spectrum.brightness_min     = CM_ARGB_GEN2_A1_BRIGHTNESS_MIN;
+    Spectrum.brightness_max     = CM_ARGB_GEN2_A1_BRIGHTNESS_MAX;
+    Spectrum.speed              = CM_ARGB_GEN2_A1_SPEED_MAX/2;
+    Spectrum.speed_min          = CM_ARGB_GEN2_A1_SPEED_MIN;
+    Spectrum.speed_max          = CM_ARGB_GEN2_A1_SPEED_MAX;
+    modes.push_back(Spectrum);
+
+    mode Static;
+    Static.name                 = "Static";
+    Static.value                = CM_ARGB_GEN2_A1_STATIC_MODE;
+    Static.flags                = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_MANUAL_SAVE;
+    Static.color_mode           = MODE_COLORS_MODE_SPECIFIC;
+    Static.brightness           = CM_ARGB_GEN2_A1_BRIGHTNESS_MAX;
+    Static.brightness_min       = CM_ARGB_GEN2_A1_BRIGHTNESS_MIN;
+    Static.brightness_max       = CM_ARGB_GEN2_A1_BRIGHTNESS_MAX;
+    Static.colors.resize(1);
+    modes.push_back(Static);
+
+    mode Reload;
+    Reload.name                 = "Reload";
+    Reload.value                = CM_ARGB_GEN2_A1_RELOAD_MODE;
+    Reload.flags                = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_MANUAL_SAVE;
+    Reload.color_mode           = MODE_COLORS_MODE_SPECIFIC;
+    Reload.brightness           = CM_ARGB_GEN2_A1_BRIGHTNESS_MAX;
+    Reload.brightness_min       = CM_ARGB_GEN2_A1_BRIGHTNESS_MIN;
+    Reload.brightness_max       = CM_ARGB_GEN2_A1_BRIGHTNESS_MAX;
+    Reload.speed                = CM_ARGB_GEN2_A1_SPEED_MAX/2;
+    Reload.speed_min            = CM_ARGB_GEN2_A1_SPEED_MIN;
+    Reload.speed_max            = CM_ARGB_GEN2_A1_SPEED_MAX;
+    Reload.colors.resize(1);
+    modes.push_back(Reload);
+
+    mode Recoil;
+    Recoil.name                 = "Recoil";
+    Recoil.value                = CM_ARGB_GEN2_A1_RECOIL_MODE;
+    Recoil.flags                = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_MANUAL_SAVE;
+    Recoil.color_mode           = MODE_COLORS_MODE_SPECIFIC;
+    Recoil.brightness           = CM_ARGB_GEN2_A1_BRIGHTNESS_MAX;
+    Recoil.brightness_min       = CM_ARGB_GEN2_A1_BRIGHTNESS_MIN;
+    Recoil.brightness_max       = CM_ARGB_GEN2_A1_BRIGHTNESS_MAX;
+    Recoil.speed                = CM_ARGB_GEN2_A1_SPEED_MAX/2;
+    Recoil.speed_min            = CM_ARGB_GEN2_A1_SPEED_MIN;
+    Recoil.speed_max            = CM_ARGB_GEN2_A1_SPEED_MAX;
+    Recoil.colors.resize(1);
+    modes.push_back(Recoil);
+
+    mode Breathing;
+    Breathing.name              = "Breathing";
+    Breathing.value             = CM_ARGB_GEN2_A1_BREATHING_MODE;
+    Breathing.flags             = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_MANUAL_SAVE;
+    Breathing.color_mode        = MODE_COLORS_MODE_SPECIFIC;
+    Breathing.brightness        = CM_ARGB_GEN2_A1_BRIGHTNESS_MAX;
+    Breathing.brightness_min    = CM_ARGB_GEN2_A1_BRIGHTNESS_MIN;
+    Breathing.brightness_max    = CM_ARGB_GEN2_A1_BRIGHTNESS_MAX;
+    Breathing.speed             = CM_ARGB_GEN2_A1_SPEED_MAX/2;
+    Breathing.speed_min         = CM_ARGB_GEN2_A1_SPEED_MIN;
+    Breathing.speed_max         = CM_ARGB_GEN2_A1_SPEED_MAX;
+    Breathing.colors.resize(1);
+    modes.push_back(Breathing);
+
+
+    mode Refill;
+    Refill.name                 = "Refill";
+    Refill.value                = CM_ARGB_GEN2_A1_REFILL_MODE;
+    Refill.flags                = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_MANUAL_SAVE;
+    Refill.color_mode           = MODE_COLORS_MODE_SPECIFIC;
+    Refill.brightness           = CM_ARGB_GEN2_A1_BRIGHTNESS_MAX;
+    Refill.brightness_min       = CM_ARGB_GEN2_A1_BRIGHTNESS_MIN;
+    Refill.brightness_max       = CM_ARGB_GEN2_A1_BRIGHTNESS_MAX;
+    Refill.speed                = CM_ARGB_GEN2_A1_SPEED_MAX/2;
+    Refill.speed_min            = CM_ARGB_GEN2_A1_SPEED_MIN;
+    Refill.speed_max            = CM_ARGB_GEN2_A1_SPEED_MAX;
+    Refill.colors.resize(1);
+    modes.push_back(Refill);
+
+    mode Demo;
+    Demo.name                   = "Demo";
+    Demo.value                  = CM_ARGB_GEN2_A1_DEMO_MODE;
+    Demo.flags                  = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
+    Demo.color_mode             = MODE_COLORS_NONE;
+    Demo.brightness             = CM_ARGB_GEN2_A1_BRIGHTNESS_MAX;
+    Demo.brightness_min         = CM_ARGB_GEN2_A1_BRIGHTNESS_MIN;
+    Demo.brightness_max         = CM_ARGB_GEN2_A1_BRIGHTNESS_MAX;
+    modes.push_back(Demo);
+
+    mode FillFlow;
+    FillFlow.name               = "Fill Flow";
+    FillFlow.value              = CM_ARGB_GEN2_A1_FILL_FLOW_MODE;
+    FillFlow.flags              = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_MANUAL_SAVE;;
+    FillFlow.color_mode         = MODE_COLORS_NONE;
+    FillFlow.brightness         = CM_ARGB_GEN2_A1_BRIGHTNESS_MAX;
+    FillFlow.brightness_min     = CM_ARGB_GEN2_A1_BRIGHTNESS_MIN;
+    FillFlow.brightness_max     = CM_ARGB_GEN2_A1_BRIGHTNESS_MAX;
+    FillFlow.speed              = CM_ARGB_GEN2_A1_SPEED_MAX/2;
+    FillFlow.speed_min          = CM_ARGB_GEN2_A1_SPEED_MIN;
+    FillFlow.speed_max          = CM_ARGB_GEN2_A1_SPEED_MAX;
+    modes.push_back(FillFlow);
+
+    mode Rainbow;
+    Rainbow.name               = "Rainbow";
+    Rainbow.value              = CM_ARGB_GEN2_A1_RAINBOW_MODE;
+    Rainbow.flags              = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_MANUAL_SAVE;;
+    Rainbow.color_mode         = MODE_COLORS_NONE;
+    Rainbow.brightness         = CM_ARGB_GEN2_A1_BRIGHTNESS_MAX;
+    Rainbow.brightness_min     = CM_ARGB_GEN2_A1_BRIGHTNESS_MIN;
+    Rainbow.brightness_max     = CM_ARGB_GEN2_A1_BRIGHTNESS_MAX;
+    Rainbow.speed              = CM_ARGB_GEN2_A1_SPEED_MAX/2;
+    Rainbow.speed_min          = CM_ARGB_GEN2_A1_SPEED_MIN;
+    Rainbow.speed_max          = CM_ARGB_GEN2_A1_SPEED_MAX;
+    modes.push_back(Rainbow);
+
+    mode Custom;
+    Custom.name                 = "Custom";
+    Custom.value                = CM_ARGB_GEN2_A1_CUSTOM_MODE;
+    Custom.flags                = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_MANUAL_SAVE;
+    Custom.color_mode           = MODE_COLORS_PER_LED;
+    modes.push_back(Custom);
+
+    mode Off;
+    Off.name                    = "Off";
+    Off.value                   = CM_ARGB_GEN2_A1_OFF_MODE;
+    Off.flags                   = MODE_FLAG_MANUAL_SAVE;
+    Off.color_mode              = MODE_COLORS_NONE;
+    modes.push_back(Off);
+
+    SetupZones();
+}
+
+RGBController_CMARGBGen2A1Controller::~RGBController_CMARGBGen2A1Controller()
+{
+    delete controller;
+}
+
+void RGBController_CMARGBGen2A1Controller::SetupZones()
+{
+    unsigned int total_leds = 0;
+
+    for(unsigned int channel = 0; channel < CM_ARGB_GEN2_A1_CHANNEL_COUNT; channel++)
+    {
+        zone new_zone;
+
+        new_zone.name       = "Channel " + std::to_string(channel + 1);
+        new_zone.type       = ZONE_TYPE_LINEAR;
+        new_zone.leds_min   = 0;
+        new_zone.leds_max   = CM_ARGB_GEN2_A1_CHANNEL_MAX_SIZE;
+        new_zone.leds_count = 0;
+        new_zone.matrix_map = nullptr;
+
+        zones.push_back(new_zone);
+
+        total_leds += new_zone.leds_count;
+    }
+
+    leds.resize(total_leds);
+
+    for(unsigned int i = 0; i < total_leds; i++)
+    {
+        leds[i].name = "LED " + std::to_string(i + 1);
+    }
+
+    SetupColors();
+}
+
+void RGBController_CMARGBGen2A1Controller::ResizeZone(int zone, int new_size)
+{
+    zones[zone].leds_count = new_size;
+
+    // todo: refactor with above code
+    unsigned int total_leds = 0;
+
+    for(unsigned int channel = 0; channel < CM_ARGB_GEN2_A1_CHANNEL_COUNT; channel++)
+    {
+        total_leds += zones[channel].leds_count;
+    }
+
+    leds.resize(total_leds);
+
+    for(unsigned int i = 0; i < total_leds; i++)
+    {
+        leds[i].name = "LED " + std::to_string(i + 1);
+    }
+
+    controller->SetupZoneSize(zone, new_size);
+
+    SetupColors();
+}
+
+void RGBController_CMARGBGen2A1Controller::DeviceUpdateLEDs()
+{
+    for(unsigned int channel = 0; channel < CM_ARGB_GEN2_A1_CHANNEL_COUNT; channel ++)
+    {
+        UpdateZoneLEDs(channel);
+    }
+}
+
+void RGBController_CMARGBGen2A1Controller::UpdateZoneLEDs(int zone)
+{    
+    if(zones[zone].leds_count > 0)
+    {
+        unsigned int start = zones[zone].start_idx;
+        unsigned int end = start + zones[zone].leds_count;
+
+        std::vector<RGBColor> zone_colors(colors.begin() + start , colors.begin() + end);
+
+        if(modes[active_mode].value == CM_ARGB_GEN2_A1_DIRECT_MODE)
+        {
+            controller->SendDirectChannel(zone, zone_colors);
+        }
+        else
+        {
+            controller->SetCustomColors(zone, zone_colors);
+        }
+    }
+}
+
+void RGBController_CMARGBGen2A1Controller::UpdateSingleLED(int /*led*/)
+{    
+    DeviceUpdateLEDs();
+}
+
+void RGBController_CMARGBGen2A1Controller::SetCustomMode()
+{
+    active_mode = 0;
+}
+
+void RGBController_CMARGBGen2A1Controller::DeviceUpdateMode()
+{
+    const mode& active = modes[active_mode];
+
+    if(active.value == CM_ARGB_GEN2_A1_DIRECT_MODE)
+    {
+        controller->SetupDirectMode();
+    }
+    else
+    {
+        RGBColor color = active.color_mode == MODE_COLORS_MODE_SPECIFIC ?
+                    active.colors[0] : 0;
+
+        controller->SetMode
+                (
+                    active.value,
+                    active.speed,
+                    active.brightness,
+                    color,
+                    active.color_mode == MODE_COLORS_RANDOM
+                );
+    }
+}
+
+void RGBController_CMARGBGen2A1Controller::DeviceSaveMode()
+{
+    controller->SaveToFlash();
+}
+