Initialize NZXT Hue 2 fan reporting

[FAN Controller] Initial implementation for Asus TUF Fan controller
Add basic Razer Blade 14 2021 fan control based on razer-fan-control's reverse engineering effort. Commanding zero speed sets auto fan control mode
2024-10-05 17:54:39 -05:00 · 2024-10-05 16:03:50 -05:00 · 2024-10-05 16:03:50 -05:00 · 2024-10-05 16:03:50 -05:00 · 2024-10-05 16:03:50 -05:00 · 2024-10-05 16:03:49 -05:00
3640 changed files with 338949 additions and 235938 deletions
@@ -32,7 +32,10 @@ before_script:
 #-----------------------------------------------------------------------#
 "Supported Devices":
  <<: *ccache_init
-  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bullseye-64
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-amd64
+  tags:
+  - linux
+  - amd64
  stage: build
  script:
  - qmake
@@ -42,11 +45,7 @@ before_script:
  artifacts:
    name: "${CI_PROJECT_NAME}_Supported_Devices_${CI_COMMIT_SHORT_SHA}"
    paths:
-    - ./*.md
    - Supported Devices.csv
-    exclude:
-    - README.md
-    - CONTRIBUTING.md
    expire_in: 30 days

  rules:
@@ -57,18 +56,21 @@ before_script:
    allow_failure: true

 #-----------------------------------------------------------------------#
-# Linux (AppImage) 32-bit Build Target                                  #
+# Linux (AppImage) i386 Build Target                                    #
 #-----------------------------------------------------------------------#
-"Linux 32 AppImage":
+"Linux i386 AppImage":
  <<: *ccache_init
-  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-32
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-i386
+  tags:
+  - linux
+  - i386
  stage: build
  script:
  - export $(dpkg-architecture)
  - ./scripts/build-appimage.sh

  artifacts:
-    name: "${CI_PROJECT_NAME}_Linux_32_${CI_COMMIT_SHORT_SHA}"
+    name: "${CI_PROJECT_NAME}_Linux_i386_${CI_COMMIT_SHORT_SHA}"
    paths:
    - OpenRGB-i386.AppImage
    - 60-openrgb.rules
@@ -83,18 +85,21 @@ before_script:
    allow_failure: true

 #-----------------------------------------------------------------------#
-# Linux (AppImage) 64-bit Build Target                                  #
+# Linux (AppImage) amd64 Build Target                                   #
 #-----------------------------------------------------------------------#
-"Linux 64 AppImage":
+"Linux amd64 AppImage":
  <<: *ccache_init
-  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-64
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-amd64
+  tags:
+  - linux
+  - amd64
  stage: build
  script:
  - export $(dpkg-architecture)
  - ./scripts/build-appimage.sh

  artifacts:
-    name: "${CI_PROJECT_NAME}_Linux_64_${CI_COMMIT_SHORT_SHA}"
+    name: "${CI_PROJECT_NAME}_Linux_amd64_${CI_COMMIT_SHORT_SHA}"
    paths:
    - OpenRGB-x86_64.AppImage
    - 60-openrgb.rules
@@ -102,25 +107,25 @@ before_script:
    expire_in: 30 days

 #-----------------------------------------------------------------------#
-# Linux (.deb) Debian Buster (Legacy) 32-bit Build Target               #
+# Linux (AppImage) armhf Build Target                                   #
 #-----------------------------------------------------------------------#
-"Linux 32 .deb (Debian Buster)":
+"Linux armhf AppImage":
  <<: *ccache_init
-  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:buster-32
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-armhf
+  tags:
+  - linux
+  - armhf
  stage: build
  script:
-  - ./scripts/build-package-files.sh debian/changelog
-  - dpkg-architecture -l
-  - dpkg-buildpackage --target-arch i386 -us -B
-  - rm -v ../openrgb-dbgsym*.*deb
-  - mv -v ../openrgb*.deb ./
+  - export $(dpkg-architecture)
+  - ./scripts/build-appimage.sh

  artifacts:
-    name: "${CI_PROJECT_NAME}_Linux_32_deb_${CI_COMMIT_SHORT_SHA}"
+    name: "${CI_PROJECT_NAME}_Linux_armhf_${CI_COMMIT_SHORT_SHA}"
    paths:
-    - openrgb*.deb
-    exclude:
-    - openrgb-dbgsym*.*deb
+    - OpenRGB-armhf.AppImage
+    - 60-openrgb.rules
+    - README.md
    expire_in: 30 days

  rules:
@@ -131,108 +136,53 @@ before_script:
    allow_failure: true

 #-----------------------------------------------------------------------#
-# Linux (.deb) Debian Buster (Legacy) 64-bit Build Target               #
+# Linux (AppImage) arm64 Build Target                                   #
 #-----------------------------------------------------------------------#
-"Linux 64 .deb (Debian Buster)":
+"Linux arm64 AppImage":
  <<: *ccache_init
-  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:buster-64
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-arm64
+  tags:
+  - linux
+  - arm64
+  stage: build
+  script:
+  - export $(dpkg-architecture)
+  - ./scripts/build-appimage.sh
+
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_arm64_${CI_COMMIT_SHORT_SHA}"
+    paths:
+    - OpenRGB-arm64.AppImage
+    - 60-openrgb.rules
+    - 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 (.deb) Debian Bookworm i386 Build Target                        #
+#-----------------------------------------------------------------------#
+"Linux i386 .deb (Debian Bookworm)":
+  <<: *ccache_init
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-i386
+  tags:
+  - linux
+  - i386
  stage: build
  script:
  - ./scripts/build-package-files.sh debian/changelog
  - 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 (.deb) Debian Bullseye 32-bit Build Target                      #
-#-----------------------------------------------------------------------#
-"Linux 32 .deb (Debian Bullseye)":
-  <<: *ccache_init
-  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bullseye-32
-  stage: build
-  script:
-  - ./scripts/build-package-files.sh debian/changelog
-  - 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 Bullseye 64-bit Build Target                      #
-#-----------------------------------------------------------------------#
-"Linux 64 .deb (Debian Bullseye)":
-  <<: *ccache_init
-  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bullseye-64
-  stage: build
-  script:
-  - ./scripts/build-package-files.sh debian/changelog
-  - 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 (.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:
-  - ./scripts/build-package-files.sh debian/changelog
-  - 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}"
+    name: "${CI_PROJECT_NAME}_Linux_i386_deb_${CI_COMMIT_SHORT_SHA}"
    paths:
    - openrgb*.deb
    exclude:
@@ -247,11 +197,14 @@ before_script:
    allow_failure: true

 #-----------------------------------------------------------------------#
-# Linux (.deb) Debian Bookworm 64-bit Build Target                      #
+# Linux (.deb) Debian Bookworm amd64 Build Target                       #
 #-----------------------------------------------------------------------#
-"Linux 64 .deb (Debian Bookworm)":
+"Linux amd64 .deb (Debian Bookworm)":
  <<: *ccache_init
-  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-64
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-amd64
+  tags:
+  - linux
+  - amd64
  stage: build
  script:
  - ./scripts/build-package-files.sh debian/changelog
@@ -261,7 +214,7 @@ before_script:
  - mv -v ../openrgb*.deb ./

  artifacts:
-    name: "${CI_PROJECT_NAME}_Linux_64_deb_${CI_COMMIT_SHORT_SHA}"
+    name: "${CI_PROJECT_NAME}_Linux_amd64_deb_${CI_COMMIT_SHORT_SHA}"
    paths:
    - openrgb*.deb
    exclude:
@@ -276,31 +229,28 @@ before_script:
    allow_failure: true

 #-----------------------------------------------------------------------#
-# Linux (.rpm, f35) 64-bit Build Target                                 #
+# Linux (.deb) Debian Bookworm armhf Build Target                       #
 #-----------------------------------------------------------------------#
-"Linux 64 f35 rpm":
-  image: fedora:35
+"Linux armhf .deb (Debian Bookworm)":
+  <<: *ccache_init
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-armhf
+  tags:
+  - linux
+  - armhf
  stage: build
  script:
-  - dnf install rpmdevtools dnf-plugins-core -y
-  - rpmdev-setuptree
-  - ./scripts/build-package-files.sh fedora/OpenRGB.spec
-  - ls /root/
-  - cp fedora/OpenRGB.spec /root/rpmbuild/SPECS
-  - cp ../OpenRGB /root/rpmbuild/SOURCES/ -r
-  - cd /root/rpmbuild/SOURCES
-  - tar -cf OpenRGB.tar.gz OpenRGB/
-  - cd ..
-  - dnf builddep SPECS/OpenRGB.spec -y
-  - rpmbuild -ba SPECS/OpenRGB.spec
-  - cd RPMS/x86_64/
-  - mv openrgb*.rpm ${CI_PROJECT_DIR}/
-  - cd ${CI_PROJECT_DIR}
+  - ./scripts/build-package-files.sh debian/changelog
+  - dpkg-architecture -l
+  - dpkg-buildpackage -us -B
+  - rm -v ../openrgb-dbgsym*.deb
+  - mv -v ../openrgb*.deb ./

  artifacts:
-    name: "${CI_PROJECT_NAME}_Linux_64_rpm_${CI_COMMIT_SHORT_SHA}"
+    name: "${CI_PROJECT_NAME}_Linux_armhf_deb_${CI_COMMIT_SHORT_SHA}"
    paths:
-    - openrgb*.rpm
+    - openrgb*.deb
+    exclude:
+    - openrgb-dbgsym*.deb
    expire_in: 30 days

  rules:
@@ -311,10 +261,42 @@ before_script:
    allow_failure: true

 #-----------------------------------------------------------------------#
-# Linux (.rpm, f36) 64-bit Build Target                                 #
+# Linux (.deb) Debian Bookworm arm64 Build Target                       #
 #-----------------------------------------------------------------------#
-"Linux 64 f36 rpm":
-  image: fedora:36
+"Linux arm64 .deb (Debian Bookworm)":
+  <<: *ccache_init
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-arm64
+  tags:
+  - linux
+  - arm64
+  stage: build
+  script:
+  - ./scripts/build-package-files.sh debian/changelog
+  - dpkg-architecture -l
+  - dpkg-buildpackage -us -B
+  - rm -v ../openrgb-dbgsym*.deb
+  - mv -v ../openrgb*.deb ./
+
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_arm64_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, F40) 64-bit Build Target                                 #
+#-----------------------------------------------------------------------#
+"Linux 64 F40 rpm":
+  image: fedora:40
  stage: build
  script:
  - dnf install rpmdevtools dnf-plugins-core libcurl-devel qt5-qtbase-devel -y
@@ -346,73 +328,9 @@ before_script:
    allow_failure: true

 #-----------------------------------------------------------------------#
-# Debian 32 Buster test                                                 #
+# Debian i386 Bookworm test                                             #
 #-----------------------------------------------------------------------#
-"Debian 32 Buster":
-  image: i386/debian:buster
-  stage: test
-  script:
-  - apt update
-  - DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*i386.deb
-  - openrgb --version
-  - apt remove -y openrgb
-  dependencies:
-  - "Linux 32 .deb (Debian Buster)"
-  needs:
-  - "Linux 32 .deb (Debian Buster)"
-
-#-----------------------------------------------------------------------#
-# Debian 64 Buster test                                                 #
-#-----------------------------------------------------------------------#
-"Debian 64 Buster":
-  image: amd64/debian:buster
-  stage: test
-  script:
-  - apt update
-  - DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*amd64.deb
-  - openrgb --version
-  - apt remove -y openrgb
-  dependencies:
-  - "Linux 64 .deb (Debian Buster)"
-  needs:
-  - "Linux 64 .deb (Debian Buster)"
-
-#-----------------------------------------------------------------------#
-# Debian 32 Bullseye test                                               #
-#-----------------------------------------------------------------------#
-"Debian 32 Bullseye":
-  image: i386/debian:bullseye
-  stage: test
-  script:
-  - apt update
-  - DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*i386.deb
-  - openrgb --version
-  - apt remove -y openrgb
-  dependencies:
-  - "Linux 32 .deb (Debian Bullseye)"
-  needs:
-  - "Linux 32 .deb (Debian Bullseye)"
-
-#-----------------------------------------------------------------------#
-# Debian 64 Bullseye test                                               #
-#-----------------------------------------------------------------------#
-"Debian 64 Bullseye":
-  image: amd64/debian:bullseye
-  stage: test
-  script:
-  - apt update
-  - DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*amd64.deb
-  - openrgb --version
-  - apt remove -y openrgb
-  dependencies:
-  - "Linux 64 .deb (Debian Bullseye)"
-  needs:
-  - "Linux 64 .deb (Debian Bullseye)"
-
-#-----------------------------------------------------------------------#
-# Debian 32 Bookworm test                                               #
-#-----------------------------------------------------------------------#
-"Debian 32 Bookworm":
+"Debian i386 Bookworm":
  image: i386/debian:bookworm
  stage: test
  script:
@@ -421,14 +339,14 @@ before_script:
  - openrgb --version
  - apt remove -y openrgb
  dependencies:
-  - "Linux 32 .deb (Debian Bookworm)"
+  - "Linux i386 .deb (Debian Bookworm)"
  needs:
-  - "Linux 32 .deb (Debian Bookworm)"
+  - "Linux i386 .deb (Debian Bookworm)"

 #-----------------------------------------------------------------------#
-# Debian 64 Bookworm test                                               #
+# Debian amd64 Bookworm test                                            #
 #-----------------------------------------------------------------------#
-"Debian 64 Bookworm":
+"Debian amd64 Bookworm":
  image: amd64/debian:bookworm
  stage: test
  script:
@@ -437,30 +355,14 @@ before_script:
  - openrgb --version
  - apt remove -y openrgb
  dependencies:
-  - "Linux 64 .deb (Debian Bookworm)"
+  - "Linux amd64 .deb (Debian Bookworm)"
  needs:
-  - "Linux 64 .deb (Debian Bookworm)"
+  - "Linux amd64 .deb (Debian Bookworm)"

 #-----------------------------------------------------------------------#
-# Ubuntu 64 20.04LTS test                                               #
+# Ubuntu amd64 22.04 test                                               #
 #-----------------------------------------------------------------------#
-"Ubuntu 64 20.04LTS":
-  image: ubuntu:focal
-  stage: test
-  script:
-  - apt update
-  - DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*amd64.deb
-  - openrgb --version
-  - apt remove -y openrgb
-  dependencies:
-  - "Linux 64 .deb (Debian Buster)"
-  needs:
-  - "Linux 64 .deb (Debian Buster)"
-
-#-----------------------------------------------------------------------#
-# Ubuntu 64 22.04 test                                                  #
-#-----------------------------------------------------------------------#
-"Ubuntu 64 22.04LTS":
+"Ubuntu amd64 22.04LTS":
  image: ubuntu:jammy
  stage: test
  script:
@@ -469,39 +371,40 @@ before_script:
  - openrgb --version
  - apt remove -y openrgb
  dependencies:
-  - "Linux 64 .deb (Debian Bookworm)"
+  - "Linux amd64 .deb (Debian Bookworm)"
  needs:
-  - "Linux 64 .deb (Debian Bookworm)"
+  - "Linux amd64 .deb (Debian Bookworm)"

 #-----------------------------------------------------------------------#
-# Fedora 64 v35 test                                                    #
+# Ubuntu amd64 24.04 test                                               #
 #-----------------------------------------------------------------------#
-"Fedora 64 v35":
-  image: fedora:35
+"Ubuntu amd64 24.04LTS":
+  image: ubuntu:noble
+  stage: test
+  script:
+  - apt update
+  - DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*amd64.deb
+  - openrgb --version
+  - apt remove -y openrgb
+  dependencies:
+  - "Linux amd64 .deb (Debian Bookworm)"
+  needs:
+  - "Linux amd64 .deb (Debian Bookworm)"
+
+#-----------------------------------------------------------------------#
+# Fedora 64 v40 test                                                    #
+#-----------------------------------------------------------------------#
+"Fedora 64 v40":
+  image: fedora:40
  stage: test
  script:
  - yum -y localinstall ./openrgb*64.rpm
  - openrgb --version
  - yum -y remove openrgb
  dependencies:
-  - "Linux 64 f35 rpm"
+  - "Linux 64 F40 rpm"
  needs:
-  - "Linux 64 f35 rpm"
-
-#-----------------------------------------------------------------------#
-# Fedora 64 v36 test                                                    #
-#-----------------------------------------------------------------------#
-"Fedora 64 v36":
-  image: fedora:36
-  stage: test
-  script:
-  - yum -y localinstall ./openrgb*64.rpm
-  - openrgb --version
-  - yum -y remove openrgb
-  dependencies:
-  - "Linux 64 f36 rpm"
-  needs:
-  - "Linux 64 f36 rpm"
+  - "Linux 64 F40 rpm"

 #-----------------------------------------------------------------------#
 # Windows (32-bit) Build Target                                         #
@@ -43,6 +43,7 @@ CODEOWNERS @Calcprogrammer1
 /Controllers/EVGAGP102GPUController/
 /Controllers/EVGAPascalGPUController/
 /Controllers/EVGATuringGPUController/                       @TheRogueZeta
+/Controllers/EVGASMBusController/                           @balika011
 /Controllers/EVGAUSBController/                             @Dr_No
 /Controllers/EVisionKeyboardController/
 /Controllers/EspurnaController/
@@ -1,17 +1,20 @@
-#include "AutoStart-FreeBSD.h"
-#include "LogManager.h"
-#include "filesystem.h"
+/*---------------------------------------------------------*\
+| AutoStart-FreeBSD.cpp                                     |
+|                                                           |
+|   Autostart implementation for FreeBSD                    |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include <fstream>
 #include <iostream>
 #include <limits.h>
 #include <unistd.h>
 #include <sstream>
-
-/*-----------------------------------------------------*\
-| FreeBSD AutoStart Implementation                      |
-| Public Methods                                        |
-\*-----------------------------------------------------*/
+#include "AutoStart-FreeBSD.h"
+#include "LogManager.h"
+#include "filesystem.h"

 AutoStart::AutoStart(std::string name)
 {
@@ -1,3 +1,12 @@
+/*---------------------------------------------------------*\
+| AutoStart-FreeBSD.h                                       |
+|                                                           |
+|   Autostart implementation for FreeBSD                    |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #pragma once

 #include <string>
@@ -1,17 +1,20 @@
-#include "AutoStart-Linux.h"
-#include "LogManager.h"
-#include "filesystem.h"
+/*---------------------------------------------------------*\
+| AutoStart-Linux.cpp                                       |
+|                                                           |
+|   Autostart implementation for Linux                      |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include <fstream>
 #include <iostream>
 #include <sstream>
 #include <unistd.h>
 #include <linux/limits.h>
-
-/*-----------------------------------------------------*\
-| Linux AutoStart Implementation                        |
-| Public Methods                                        |
-\*-----------------------------------------------------*/
+#include "AutoStart-Linux.h"
+#include "LogManager.h"
+#include "filesystem.h"

 AutoStart::AutoStart(std::string name)
 {
@@ -122,7 +125,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 +162,7 @@ std::string AutoStart::GenerateDesktopFile(AutoStartInfo autostart_info)
    }

    fileContents << std::endl;
-    
+
    return(fileContents.str());
 }

@@ -198,7 +201,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);
@@ -1,3 +1,12 @@
+/*---------------------------------------------------------*\
+| AutoStart-Linux.h                                         |
+|                                                           |
+|   Autostart implementation for Linux                      |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #pragma once

 #include <string>
@@ -1,18 +1,20 @@
-#include "AutoStart-MacOS.h"
-#include "LogManager.h"
-#include "filesystem.h"
+/*---------------------------------------------------------*\
+| AutoStart-MacOS.cpp                                       |
+|                                                           |
+|   Autostart implementation for MacOS                      |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include <fstream>
 #include <sstream>
 #include <iostream>
 #include <unistd.h>
-
 #include <mach-o/dyld.h>
-
-/*-----------------------------------------------------*\
-| MacOS AutoStart Implementation                        |
-| Public Methods                                        |
-\*-----------------------------------------------------*/
+#include "AutoStart-MacOS.h"
+#include "LogManager.h"
+#include "filesystem.h"

 AutoStart::AutoStart(std::string name)
 {
@@ -152,7 +154,7 @@ std::string AutoStart::GenerateLaunchAgentFile(AutoStartInfo autostart_info)
    fileContents << "    <key>ProgramArguments</key>"                                                                               << std::endl;
    fileContents << "    <array>"                                                                                                   << std::endl;
    fileContents << "        <string>" << autostart_info.path << "</string>"                                                        << std::endl;
-    
+
    if(autostart_info.args != "")
    {
        std::istringstream arg_parser(autostart_info.args);
@@ -163,12 +165,12 @@ std::string AutoStart::GenerateLaunchAgentFile(AutoStartInfo autostart_info)
            fileContents << "        <string>" << arg << "</string>"                                                                << std::endl;
        }
    }
-    
+
    fileContents << "    </array>"                                                                                                  << std::endl;
    fileContents << "    <key>RunAtLoad</key><true/>"                                                                               << std::endl;
    fileContents << "</dict>"                                                                                                       << std::endl;
    fileContents << "</plist>"                                                                                                      << std::endl;
-    
+
    return(fileContents.str());
 }

@@ -193,7 +195,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);
@@ -1,3 +1,12 @@
+/*---------------------------------------------------------*\
+| AutoStart-MacOS.h                                         |
+|                                                           |
+|   Autostart implementation for MacOS                      |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #pragma once

 #include <string>
@@ -1,17 +1,19 @@
-#include "AutoStart-Windows.h"
-#include "LogManager.h"
-#include "filesystem.h"
+/*---------------------------------------------------------*\
+| AutoStart-Windows.cpp                                     |
+|                                                           |
+|   Autostart implementation for Windows                    |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include <fstream>
 #include <iostream>
-
-#include "windows.h"
 #include <shlobj.h>
-
-/*-----------------------------------------------------*\
-| Windows AutoStart Implementation                      |
-| Public Methods                                        |
-\*-----------------------------------------------------*/
+#include "AutoStart-Windows.h"
+#include "LogManager.h"
+#include "filesystem.h"
+#include "windows.h"

 AutoStart::AutoStart(std::string name)
 {
@@ -41,7 +43,7 @@ bool AutoStart::DisableAutoStart()
        else
        {
            success = filesystem::remove(autostart_file, autostart_file_remove_errcode);
-            
+
            if(!success)
            {
                LOG_ERROR("An error occurred removing the auto start file.");
@@ -97,11 +99,11 @@ bool AutoStart::EnableAutoStart(AutoStartInfo autostart_info)
            shellLink->SetArguments(argumentsw.c_str());
            shellLink->SetDescription(descriptionw.c_str());
            shellLink->SetIconLocation(iconw.c_str(), 0);
-            
+
            IPersistFile* persistFile;
-            
+
            result                                  = shellLink->QueryInterface(IID_IPersistFile, (void**)&persistFile);
-            
+
            if(SUCCEEDED(result))
            {
                result                              = persistFile->Save(startupfilepathw.c_str(), TRUE);
@@ -151,7 +153,7 @@ std::string AutoStart::GetExePath()
    char exepath[MAX_PATH] = "";

    DWORD count = GetModuleFileNameA(NULL, exepath, MAX_PATH);
-    
+
    return(std::string(exepath, (count > 0) ? count : 0));
 }

@@ -197,8 +199,8 @@ std::wstring AutoStart::utf8_decode(const std::string& str)
    int size_needed = MultiByteToWideChar(CP_UTF8, 0, &str[0], (int) str.size(), nullptr, 0);

    std::wstring wstrTo(size_needed, 0);
-    
+
    MultiByteToWideChar(CP_UTF8, 0, &str[0], (int) str.size(), &wstrTo[0], size_needed);
-    
+
    return(wstrTo);
 }
@@ -1,3 +1,12 @@
+/*---------------------------------------------------------*\
+| AutoStart-Windows.h                                       |
+|                                                           |
+|   Autostart implementation for Windows                    |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #pragma once

 #include <string>
@@ -1,9 +1,13 @@
-#include "AutoStart.h"
+/*---------------------------------------------------------*\
+| AutoStart.cpp                                             |
+|                                                           |
+|   Autostart common implementation                         |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

-/*-----------------------------------------------------*\
-| Common AutoStart Implementation                       |
-| Public Methods                                        |
-\*-----------------------------------------------------*/
+#include "AutoStart.h"

 std::string AutoStartInterface::GetAutoStartFile()
 {
@@ -1,3 +1,12 @@
+/*---------------------------------------------------------*\
+| AutoStart.h                                               |
+|                                                           |
+|   Autostart common implementation                         |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #pragma once

 #include <string>
@@ -1,3 +1,12 @@
+/*---------------------------------------------------------*\
+| Colors.h                                                  |
+|                                                           |
+|   List of named color constants                           |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #ifndef COLORS_H
 #define COLORS_H

@@ -1,17 +1,19 @@
-/*-------------------------------------------------------------------*\
-|  A4TechDetector.cpp                                                 |
-|                                                                     |
-|  Driver for A4Tech Devices Detector                                 |
-|                                                                     |
-|  Chris M (Dr_No)                              30 Jun 2022           |
-|  Mohammed Julfikar Ali Mahbub (o-julfikar)    01 Apr 2024           |
-|                                                                     |
-\*-------------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| A4TechDetector.cpp                                        |
+|                                                           |
+|   Detector for A4Tech Devices                             |
+|                                                           |
+|   Chris M (Dr_No)                             30 Jun 2022 |
+|   Mohammed Julfikar Ali Mahbub (o-julfikar)   01 Apr 2024 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 /*-----------------------------------------------------*\
 | OpenRGB includes                                      |
 \*-----------------------------------------------------*/
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "RGBController.h"

@@ -55,6 +57,7 @@ void DetectBloodyB820R(hid_device_info* info, const std::string& name)
 }

 REGISTER_HID_DETECTOR_IPU("Bloody W60 Pro",         DetectA4TechMouseControllers,       A4_TECH_VID,    BLOODY_W60_PRO_PID,     2,      0xFF33,     0x0529);
+REGISTER_HID_DETECTOR_IPU("Bloody W70 Max",         DetectA4TechMouseControllers,       A4_TECH_VID,    BLOODY_W70_MAX_PID,     2,      0xFF33,     0x0518);
 REGISTER_HID_DETECTOR_IPU("Bloody W90 Max",         DetectA4TechMouseControllers,       A4_TECH_VID,    BLOODY_W90_MAX_PID,     2,      0xFF33,     0x053D);
 REGISTER_HID_DETECTOR_IPU("Bloody MP 50RS",         DetectA4TechMouseControllers,       A4_TECH_VID,    BLOODY_MP_50RS_PID,     2,      0xFFF2,     0x6009);
-REGISTER_HID_DETECTOR_IPU("A4Tech Bloody B820R",    DetectBloodyB820R,                  A4_TECH_VID,    BLOODY_B820R_PID,       2,      0xFF52,     0x0210);
+REGISTER_HID_DETECTOR_IPU("A4Tech Bloody B820R",    DetectBloodyB820R,                  A4_TECH_VID,    BLOODY_B820R_PID,       2,      0xFF52,     0x0210);
@@ -1,21 +1,24 @@
-/*-------------------------------------------------------------------*\
-|  BloodyB820RController.cpp                                          |
-|                                                                     |
-|  Driver for A4Tech Bloody B820R Keyboard Controller                 |
-|                                                                     |
-|  Mohammed Julfikar Ali Mahbub (o-julfikar)          01 Apr 2024     |
-|                                                                     |
-\*-------------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| BloodyB820RController.cpp                                 |
+|                                                           |
+|   Driver for A4Tech Bloody B820R Keyboard                 |
+|                                                           |
+|   Mohammed Julfikar Ali Mahbub (o-julfikar)   01 Apr 2024 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include "BloodyB820RController.h"
+#include "StringUtils.h"

-/*--------------------------------------------------------------------------------------*\
- * The controller for this device should pass a packet of 64 bytes where the subsequent *
- * two packets are for RED, GREEN, and BLUE respectively. The first 6 bytes are control *
- * or information bytes and colors bytes starts from index 6. Moreover, the first pack- *
- * et of each RGB contains color for 58 keys and the rest (104 - 58 == 46) are send on  *
- * the second packet.                                                                   *
-\*--------------------------------------------------------------------------------------*/
+/*-------------------------------------------------------------------------------------*\
+| The controller for this device should pass a packet of 64 bytes where the subsequent  |
+| two packets are for RED, GREEN, and BLUE respectively. The first 6 bytes are control  |
+| or information bytes and colors bytes starts from index 6. Moreover, the first pack-  |
+| et of each RGB contains color for 58 keys and the rest (104 - 58 == 46) are send on   |
+| the second packet.                                                                    |
+\*-------------------------------------------------------------------------------------*/

 BloodyB820RController::BloodyB820RController(hid_device* dev_handle, const char* path)
 {
@@ -33,14 +36,15 @@ BloodyB820RController::~BloodyB820RController()

 std::string BloodyB820RController::GetSerial()
 {
-    const int szTemp    = HID_MAX_STR;
-    wchar_t   tmpName[szTemp];
+    wchar_t serial_string[HID_MAX_STR];
+    int ret = hid_get_serial_number_string(dev, serial_string, HID_MAX_STR);

-    hid_get_serial_number_string(dev, tmpName, szTemp);
-    std::wstring wName  = std::wstring(tmpName);
-    std::string serial  = std::string(wName.begin(), wName.end());
+    if(ret != 0)
+    {
+        return("");
+    }

-    return serial;
+    return(StringUtils::wstring_to_string(serial_string));
 }

 std::string BloodyB820RController::GetLocation()
@@ -50,12 +54,12 @@ std::string BloodyB820RController::GetLocation()

 void  BloodyB820RController::SendControlPacket(uint8_t data)
 {
-    uint8_t buffer[BLOODY_B820R_PACKET_SIZE]   = { 0x07, 0x03, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00 };
+    uint8_t buffer[BLOODY_B820R_PACKET_SIZE]    = { 0x07, 0x03, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00 };

    hid_send_feature_report(dev, buffer, BLOODY_B820R_PACKET_SIZE);

-    buffer[BLOODY_B820R_MODE_BYTE]                   = 0;
-    buffer[BLOODY_B820R_DATA_BYTE]                   = data;
+    buffer[BLOODY_B820R_MODE_BYTE]              = 0;
+    buffer[BLOODY_B820R_DATA_BYTE]              = data;

    hid_send_feature_report(dev, buffer, BLOODY_B820R_PACKET_SIZE);
 }
@@ -75,14 +79,12 @@ void BloodyB820RController::SetLEDDirect(std::vector<RGBColor> colors)
    |   packet_map is the index of the Key from full_matrix_map and     |
    |   the value is the position in the direct packet buffer           |
    \*-----------------------------------------------------------------*/
-
-
    for(size_t i = 0; i < colors.size(); i++)
    {
-        RGBColor    color                     = colors[i];
-        uint8_t     offset                    = BLOODY_B820R_RGB_OFFSET;
-        uint8_t     buffer_idx                = offset + i % BLOODY_B820R_RGB_BUFFER_SIZE;
-        uint8_t*    buffers[2][3]             =
+        RGBColor    color                       = colors[i];
+        uint8_t     offset                      = BLOODY_B820R_RGB_OFFSET;
+        uint8_t     buffer_idx                  = offset + i % BLOODY_B820R_RGB_BUFFER_SIZE;
+        uint8_t*    buffers[2][3]               =
                {
                        {r1_buffer, g1_buffer, b1_buffer},
                        {r2_buffer, g2_buffer, b2_buffer}
@@ -99,4 +101,4 @@ void BloodyB820RController::SetLEDDirect(std::vector<RGBColor> colors)
    hid_send_feature_report(dev, g2_buffer, BLOODY_B820R_PACKET_SIZE);
    hid_send_feature_report(dev, b1_buffer, BLOODY_B820R_PACKET_SIZE);
    hid_send_feature_report(dev, b2_buffer, BLOODY_B820R_PACKET_SIZE);
-}
+}
@@ -1,19 +1,21 @@
-/*-------------------------------------------------------------------*\
-|  BloodyB820RController.h                                            |
-|                                                                     |
-|  Driver for A4Tech Bloody B820R Keyboard Controller                 |
-|                                                                     |
-|  Mohammed Julfikar Ali Mahbub (o-julfikar)          01 Apr 2024     |
-|                                                                     |
-\*-------------------------------------------------------------------*/
-
-#include <string>
-#include <hidapi/hidapi.h>
-#include "RGBController.h"
+/*---------------------------------------------------------*\
+| BloodyB820RController.h                                   |
+|                                                           |
+|   Driver for A4Tech Bloody B820R Keyboard                 |
+|                                                           |
+|   Mohammed Julfikar Ali Mahbub (o-julfikar)   01 Apr 2024 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once
-#define NA                                      0xFFFFFFFF
-#define HID_MAX_STR                             255
+
+#include <string>
+#include <hidapi.h>
+#include "RGBController.h"
+
+#define HID_MAX_STR                     255

 #define BLOODY_B820R_RGB_BUFFER_SIZE    58
 #define BLOODY_B820R_RGB_OFFSET         6
@@ -25,9 +27,9 @@
 #define BLOODY_B820R_RELEASE_CONTROL    0x00

 /*---------------------------------------------------------*\
-| Bloody B820R product ID                                    |
+| Bloody B820R product ID                                   |
 \*---------------------------------------------------------*/
-#define BLOODY_B820R_PID                               0xFA10
+#define BLOODY_B820R_PID                            0xFA10

 enum
 {
@@ -0,0 +1,253 @@
+/*---------------------------------------------------------*\
+| RGBController_BloodyB820R.cpp                             |
+|                                                           |
+|   RGBController for A4Tech Bloody B820R Keyboard          |
+|                                                           |
+|   Mohammed Julfikar Ali Mahbub (o-julfikar)   01 Apr 2024 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include "RGBControllerKeyNames.h"
+#include "RGBController_BloodyB820R.h"
+
+//0xFFFFFFFF indicates an unused entry in matrix
+#define NA  0xFFFFFFFF
+
+static unsigned int matrix_map[6][21] =
+    {
+        {0,  NA, 1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, NA, NA,  NA,  NA,  13, 14,  15},
+        {16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,  32,  33,  34, 35,  36},
+        {37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,  53,  54,  55, 56,  57},
+        {58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, NA, NA, NA,  NA,  71,  72, 73,  NA},
+        {74, NA, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, NA, NA, 86,  NA,  87,  88, 89,  90},
+        {91, 92, 93, 94, NA, NA, NA, NA, NA, NA, 95, 96, 97, 98, 99, 100, 101, 102, NA, 103, NA},
+    };
+
+static const char *led_names[] =
+    {
+        KEY_EN_ESCAPE,              //00
+        KEY_EN_F1,
+        KEY_EN_F2,
+        KEY_EN_F3,
+        KEY_EN_F4,
+        KEY_EN_F5,
+        KEY_EN_F6,
+        KEY_EN_F7,
+        KEY_EN_F8,
+        KEY_EN_F9,
+        KEY_EN_F10,
+        KEY_EN_F11,
+        KEY_EN_F12,
+        KEY_EN_PRINT_SCREEN,
+        KEY_EN_SCROLL_LOCK,
+        KEY_EN_PAUSE_BREAK,
+
+        KEY_EN_BACK_TICK,           //10
+        KEY_EN_1,
+        KEY_EN_2,
+        KEY_EN_3,
+        KEY_EN_4,
+        KEY_EN_5,
+        KEY_EN_6,
+        KEY_EN_7,
+        KEY_EN_8,
+        KEY_EN_9,
+        KEY_EN_0,
+        KEY_EN_MINUS,
+        KEY_EN_EQUALS,
+        KEY_EN_BACKSPACE,
+        KEY_EN_INSERT,
+        KEY_EN_HOME,
+        KEY_EN_PAGE_UP,
+        KEY_EN_NUMPAD_LOCK,
+        KEY_EN_NUMPAD_DIVIDE,
+        KEY_EN_NUMPAD_TIMES,
+        KEY_EN_NUMPAD_MINUS,
+
+        KEY_EN_TAB,                 //20
+        KEY_EN_Q,
+        KEY_EN_W,
+        KEY_EN_E,
+        KEY_EN_R,
+        KEY_EN_T,
+        KEY_EN_Y,
+        KEY_EN_U,
+        KEY_EN_I,
+        KEY_EN_O,
+        KEY_EN_P,
+        KEY_EN_LEFT_BRACKET,
+        KEY_EN_RIGHT_BRACKET,
+        KEY_EN_ANSI_BACK_SLASH,
+        KEY_EN_DELETE,
+        KEY_EN_END,
+        KEY_EN_PAGE_DOWN,
+        KEY_EN_NUMPAD_7,
+        KEY_EN_NUMPAD_8,
+        KEY_EN_NUMPAD_9,
+        KEY_EN_NUMPAD_PLUS,
+
+        KEY_EN_CAPS_LOCK,           //30
+        KEY_EN_A,
+        KEY_EN_S,
+        KEY_EN_D,
+        KEY_EN_F,
+        KEY_EN_G,
+        KEY_EN_H,
+        KEY_EN_J,
+        KEY_EN_K,
+        KEY_EN_L,
+        KEY_EN_SEMICOLON,
+        KEY_EN_QUOTE,
+        KEY_EN_ANSI_ENTER,
+        KEY_EN_NUMPAD_4,
+        KEY_EN_NUMPAD_5,
+        KEY_EN_NUMPAD_6,
+
+        KEY_EN_LEFT_SHIFT,          //40
+        KEY_EN_Z,
+        KEY_EN_X,
+        KEY_EN_C,
+        KEY_EN_V,
+        KEY_EN_B,
+        KEY_EN_N,
+        KEY_EN_M,
+        KEY_EN_COMMA,
+        KEY_EN_PERIOD,
+        KEY_EN_FORWARD_SLASH,
+        KEY_EN_RIGHT_SHIFT,
+        KEY_EN_UP_ARROW,
+        KEY_EN_NUMPAD_1,
+        KEY_EN_NUMPAD_2,
+        KEY_EN_NUMPAD_3,
+        KEY_EN_NUMPAD_ENTER,
+
+        KEY_EN_LEFT_CONTROL,        //50
+        KEY_EN_LEFT_WINDOWS,
+        KEY_EN_LEFT_ALT,
+        KEY_EN_SPACE,
+        KEY_EN_RIGHT_ALT,
+        KEY_EN_RIGHT_FUNCTION,
+        KEY_EN_MENU,
+        KEY_EN_RIGHT_CONTROL,
+        KEY_EN_LEFT_ARROW,
+        KEY_EN_DOWN_ARROW,
+        KEY_EN_RIGHT_ARROW,
+        KEY_EN_NUMPAD_0,
+        KEY_EN_NUMPAD_PERIOD
+    };
+
+/**------------------------------------------------------------------*\
+    @name A4Tech Bloody B820R
+    @category Keyboard
+    @type USB
+    @save :x:
+    @direct :white_check_mark:
+    @effects :x:
+    @detectors DetectBloodyB820R
+    @comment The A4Tech Bloody B820R keyboard controller currently
+        supports the full size (ANSI layout).
+\*-------------------------------------------------------------------*/
+
+RGBController_BloodyB820R::RGBController_BloodyB820R(BloodyB820RController *controller_ptr)
+{
+    controller                  = controller_ptr;
+
+    name                        = "Bloody B820R";
+    vendor                      = "A4Tech";
+    type                        = DEVICE_TYPE_KEYBOARD;
+    description                 = "A4Tech Bloody Keyboard";
+    serial                      = controller->GetSerial();
+    location                    = controller->GetLocation();
+
+    mode Direct;
+    Direct.name                 = "Direct";
+    Direct.value                = BLOODY_B820R_MODE_DIRECT;
+    Direct.flags                = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode           = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
+    SetupZones();
+}
+
+RGBController_BloodyB820R::~RGBController_BloodyB820R()
+{
+    delete controller;
+}
+
+void RGBController_BloodyB820R::SetupZones()
+{
+    /*-------------------------------------------------*\
+    | Create the Keyboard zone and add the matrix map   |
+    \*-------------------------------------------------*/
+    zone KB_zone;
+    KB_zone.name                = ZONE_EN_KEYBOARD;
+    KB_zone.type                = ZONE_TYPE_MATRIX;
+    KB_zone.leds_min            = BLOODY_B820R_KEYCOUNT;
+    KB_zone.leds_max            = BLOODY_B820R_KEYCOUNT;
+    KB_zone.leds_count          = BLOODY_B820R_KEYCOUNT;
+
+    KB_zone.matrix_map          = new matrix_map_type;
+    KB_zone.matrix_map->height  = 6;
+    KB_zone.matrix_map->width   = 21;
+    KB_zone.matrix_map->map     = (unsigned int *)&matrix_map;
+    zones.push_back(KB_zone);
+
+    /*-------------------------------------------------*\
+    | Clear any existing color/LED configuration        |
+    \*-------------------------------------------------*/
+    leds.clear();
+    colors.clear();
+
+    /*---------------------------------------------------------*\
+    | Set up zones                                              |
+    \*---------------------------------------------------------*/
+    for(unsigned int led_index = 0; led_index < BLOODY_B820R_KEYCOUNT; led_index++)
+    {
+        led new_led;
+        new_led.name        = led_names[led_index];
+        new_led.value       = led_index;
+        leds.push_back(new_led);
+    }
+
+    SetupColors();
+}
+
+void RGBController_BloodyB820R::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+
+void RGBController_BloodyB820R::DeviceUpdateLEDs()
+{
+    controller->SetLEDDirect(colors);
+}
+
+void RGBController_BloodyB820R::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->SetLEDDirect(colour);
+}
+
+void RGBController_BloodyB820R::UpdateSingleLED(int led)
+{
+    std::vector<RGBColor> colour;
+    colour.push_back(colors[led]);
+
+    controller->SetLEDDirect(colour);
+}
+
+void RGBController_BloodyB820R::DeviceUpdateMode()
+{
+    /* This device does not support modes yet */
+}
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------*\
+| RGBController_BloodyB820R.h                               |
+|                                                           |
+|   RGBController for A4Tech Bloody B820R Keyboard          |
+|                                                           |
+|   Mohammed Julfikar Ali Mahbub (o-julfikar)   01 Apr 2024 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include <vector>
+#include "RGBController.h"
+#include "BloodyB820RController.h"
+
+class RGBController_BloodyB820R : public RGBController
+{
+public:
+    RGBController_BloodyB820R(BloodyB820RController* controller_ptr);
+    ~RGBController_BloodyB820R();
+
+    void    SetupZones();
+    void    ResizeZone(int zone, int new_size);
+
+    void    DeviceUpdateLEDs();
+    void    UpdateZoneLEDs(int zone);
+    void    UpdateSingleLED(int led);
+
+    void    DeviceUpdateMode();
+
+private:
+    BloodyB820RController* controller;
+};
@@ -1,14 +1,16 @@
-/*---------------------------------------------------------------------*\
-|  BloodyMouseController.cpp                                            |
-|                                                                       |
-|  Driver for BloodyMouse USB Controller                                |
-|                                                                       |
-|  Chris M (Dr_No)          30 Jun 2022                                 |
-|                                                                       |
-\*---------------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| BloodyMouseController.cpp                                 |
+|                                                           |
+|   Driver for A4Tech Bloody Mouse                          |
+|                                                           |
+|   Chris M (Dr_No)                             30 Jun 2022 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include "BloodyMouseController.h"
-#include "LogManager.h"
+#include "StringUtils.h"

 BloodyMouseController::BloodyMouseController(hid_device* dev_handle, const char* path, uint16_t product_id)
 {
@@ -26,26 +28,20 @@ BloodyMouseController::~BloodyMouseController()

 uint16_t BloodyMouseController::GetPid()
 {
-    return pid;
+    return(pid);
 }

 std::string BloodyMouseController::GetSerial()
 {
-    const uint8_t   sz  = HID_MAX_STR;
-    wchar_t         tmp[sz];
+    wchar_t serial_string[HID_MAX_STR];
+    int ret = hid_get_serial_number_string(dev, serial_string, HID_MAX_STR);

-    int ret             = hid_get_serial_number_string(dev, tmp, sz);
-
-    if (ret != 0)
+    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;
+    return(StringUtils::wstring_to_string(serial_string));
 }

 std::string BloodyMouseController::GetLocation()
@@ -53,7 +49,7 @@ std::string BloodyMouseController::GetLocation()
    return("HID: " + location);
 }

-void  BloodyMouseController::InitDevice()
+void BloodyMouseController::InitDevice()
 {
    uint8_t buffer[BLOODYMOUSE_WRITE_PACKET_SIZE]   = { 0x07, 0x03, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00 };

@@ -65,7 +61,7 @@ void  BloodyMouseController::InitDevice()
    hid_send_feature_report(dev, buffer, BLOODYMOUSE_WRITE_PACKET_SIZE);
 }

-void  BloodyMouseController::SetLedsDirect(std::vector<RGBColor> colors)
+void BloodyMouseController::SetLedsDirect(std::vector<RGBColor> colors)
 {
    uint8_t buffer[BLOODYMOUSE_WRITE_PACKET_SIZE]   = { 0x07, 0x03, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00 };

@@ -1,22 +1,25 @@
-/*---------------------------------------------------------------------*\
-|  BloodyMouseController.h                                              |
-|                                                                       |
-|  Driver for BloodyMouse USB Controller                                |
-|                                                                       |
-|  Chris M (Dr_No)          30 Jun 2022                                 |
-|                                                                       |
-\*---------------------------------------------------------------------*/
-
-#include <string>
-#include <hidapi/hidapi.h>
-#include "RGBController.h"
+/*---------------------------------------------------------*\
+| BloodyMouseController.h                                   |
+|                                                           |
+|   Driver for A4Tech Bloody Mouse                          |
+|                                                           |
+|   Chris M (Dr_No)                             30 Jun 2022 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once

+#include <string>
+#include <hidapi.h>
+#include "RGBController.h"
+
 /*-----------------------------------------------------*\
 | Mouse product IDs                                     |
 \*-----------------------------------------------------*/
 #define BLOODY_W60_PRO_PID                          0x37EA
+#define BLOODY_W70_MAX_PID                          0x79EF
 #define BLOODY_W90_MAX_PID                          0x3666

 /*-----------------------------------------------------*\
@@ -24,7 +27,7 @@
 \*-----------------------------------------------------*/
 #define BLOODY_MP_50RS_PID                          0xFA60

-#define HID_MAX_STR 255
+#define HID_MAX_STR                     255
 #define BLOODYMOUSE_WRITE_PACKET_SIZE   64

 #define BLOODYMOUSE_BRIGHTNESS_MIN      0
@@ -54,6 +57,7 @@ public:
    std::string     GetLocation();

    void            SetLedsDirect(std::vector<RGBColor> colors);
+
 private:
    uint16_t        pid;
    std::string     location;
@@ -1,11 +1,13 @@
-/*---------------------------------------------------------------------*\
-|  RGBController_BloodyMouse.cpp                                        |
-|                                                                       |
-|  Driver for BloodyMouse USB Controller                                |
-|                                                                       |
-|  Chris M (Dr_No)          30 Jun 2022                                 |
-|                                                                       |
-\*---------------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_BloodyMouse.cpp                             |
+|                                                           |
+|   RGBController for A4Tech Bloody Mouse                   |
+|                                                           |
+|   Chris M (Dr_No)                             30 Jun 2022 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include "RGBController_BloodyMouse.h"

@@ -107,6 +109,7 @@ void RGBController_BloodyMouse::SetupZones()
        case BLOODY_W60_PRO_PID:
            layout = w60_pro;
            break;
+        case BLOODY_W70_MAX_PID:
        case BLOODY_W90_MAX_PID:
            layout = w90_max;
            break;
@@ -125,7 +128,7 @@ void RGBController_BloodyMouse::SetupZones()

        zone new_zone;
        new_zone.name           = mz.name;
-        new_zone.leds_min       = mz.zone_leds.size();
+        new_zone.leds_min       = (unsigned int)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;
@@ -1,13 +1,16 @@
-/*---------------------------------------------------------------------*\
-|  RGBController_BloodyMouse.h                                          |
-|                                                                       |
-|  Driver for BloodyMouse USB Controller                                |
-|                                                                       |
-|  Chris M (Dr_No)          30 Jun 2022                                 |
-|                                                                       |
-\*---------------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_BloodyMouse.h                               |
+|                                                           |
+|   RGBController for A4Tech Bloody Mouse                   |
+|                                                           |
+|   Chris M (Dr_No)                             30 Jun 2022 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once
+
 #include <vector>
 #include "RGBController.h"
 #include "BloodyMouseController.h"
@@ -1,247 +0,0 @@
-/*-------------------------------------------------------------------*\
-|  RGBController_BloodyB820R.cpp                                      |
-|                                                                     |
-|  Driver for A4Tech Bloody B820R Keyboard Controller                 |
-|                                                                     |
-|  Mohammed Julfikar Ali Mahbub (o-julfikar)          01 Apr 2024     |
-|                                                                     |
-\*-------------------------------------------------------------------*/
-
-#include "RGBControllerKeyNames.h"
-#include "RGBController_BloodyB820R.h"
-
-static unsigned int matrix_map[6][21] =
-        {
-                {0, NA, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, NA, NA, NA, NA, 13, 14, 15},
-                {16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36},
-                {37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57},
-                {58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, NA, NA, NA, NA, 71, 72, 73, NA},
-                {74, NA, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, NA, NA, 86, NA, 87, 88, 89, 90},
-                {91, 92, 93, 94, NA, NA, NA, NA, NA, NA, 95, 96, 97, 98, 99, 100, 101, 102, NA, 103, NA},
-        };
-
-static const char *led_names[] =
-        {
-                KEY_EN_ESCAPE,              //00
-                KEY_EN_F1,
-                KEY_EN_F2,
-                KEY_EN_F3,
-                KEY_EN_F4,
-                KEY_EN_F5,
-                KEY_EN_F6,
-                KEY_EN_F7,
-                KEY_EN_F8,
-                KEY_EN_F9,
-                KEY_EN_F10,                 
-                KEY_EN_F11,
-                KEY_EN_F12,
-                KEY_EN_PRINT_SCREEN,
-                KEY_EN_SCROLL_LOCK,
-                KEY_EN_PAUSE_BREAK,
-
-                KEY_EN_BACK_TICK,           //10
-                KEY_EN_1,
-                KEY_EN_2,
-                KEY_EN_3,
-                KEY_EN_4,                   
-                KEY_EN_5,
-                KEY_EN_6,
-                KEY_EN_7,
-                KEY_EN_8,
-                KEY_EN_9,
-                KEY_EN_0,
-                KEY_EN_MINUS,
-                KEY_EN_EQUALS,
-                KEY_EN_BACKSPACE,
-                KEY_EN_INSERT,
-                KEY_EN_HOME,
-                KEY_EN_PAGE_UP,
-                KEY_EN_NUMPAD_LOCK,
-                KEY_EN_NUMPAD_DIVIDE,
-                KEY_EN_NUMPAD_TIMES,
-                KEY_EN_NUMPAD_MINUS,
-
-                KEY_EN_TAB,                 //20
-                KEY_EN_Q,
-                KEY_EN_W,
-                KEY_EN_E,
-                KEY_EN_R,
-                KEY_EN_T,
-                KEY_EN_Y,
-                KEY_EN_U,
-                KEY_EN_I,
-                KEY_EN_O,
-                KEY_EN_P,
-                KEY_EN_LEFT_BRACKET,
-                KEY_EN_RIGHT_BRACKET,
-                KEY_EN_ANSI_BACK_SLASH,
-                KEY_EN_DELETE,
-                KEY_EN_END,
-                KEY_EN_PAGE_DOWN,
-                KEY_EN_NUMPAD_7,
-                KEY_EN_NUMPAD_8,
-                KEY_EN_NUMPAD_9,
-                KEY_EN_NUMPAD_PLUS,
-
-                KEY_EN_CAPS_LOCK,           //30
-                KEY_EN_A,
-                KEY_EN_S,
-                KEY_EN_D,
-                KEY_EN_F,
-                KEY_EN_G,
-                KEY_EN_H,
-                KEY_EN_J,
-                KEY_EN_K,
-                KEY_EN_L,
-                KEY_EN_SEMICOLON,
-                KEY_EN_QUOTE,
-                KEY_EN_ANSI_ENTER,
-                KEY_EN_NUMPAD_4,
-                KEY_EN_NUMPAD_5,
-                KEY_EN_NUMPAD_6,
-
-                KEY_EN_LEFT_SHIFT,          //40
-                KEY_EN_Z,
-                KEY_EN_X,
-                KEY_EN_C,
-                KEY_EN_V,
-                KEY_EN_B,
-                KEY_EN_N,
-                KEY_EN_M,
-                KEY_EN_COMMA,
-                KEY_EN_PERIOD,
-                KEY_EN_FORWARD_SLASH,
-                KEY_EN_RIGHT_SHIFT,
-                KEY_EN_UP_ARROW,
-                KEY_EN_NUMPAD_1,
-                KEY_EN_NUMPAD_2,
-                KEY_EN_NUMPAD_3,
-                KEY_EN_NUMPAD_ENTER,
-
-                KEY_EN_LEFT_CONTROL,        //50
-                KEY_EN_LEFT_WINDOWS,
-                KEY_EN_LEFT_ALT,
-                KEY_EN_SPACE,
-                KEY_EN_RIGHT_ALT,
-                KEY_EN_RIGHT_FUNCTION,
-                KEY_EN_MENU,
-                KEY_EN_RIGHT_CONTROL,
-                KEY_EN_LEFT_ARROW,
-                KEY_EN_DOWN_ARROW,
-                KEY_EN_RIGHT_ARROW,
-                KEY_EN_NUMPAD_0,
-                KEY_EN_NUMPAD_PERIOD
-        };
-
-/**------------------------------------------------------------------*\
-    @name A4Tech Bloody B820R
-    @category Keyboard
-    @type USB
-    @save :x:
-    @direct :white_check_mark:
-    @effects :x:
-    @detectors A4TechDetector
-    @comment The A4Tech Bloody B820R keyboard controller currently
-        supports the full size (ANSI layout).
-\*-------------------------------------------------------------------*/
-
-RGBController_BloodyB820R::RGBController_BloodyB820R(BloodyB820RController *controller_ptr)
-{
-    controller                  = controller_ptr;
-
-    name                        = "Bloody B820R";
-    vendor                      = "A4Tech";
-    type                        = DEVICE_TYPE_KEYBOARD;
-    description                 = "A4Tech Bloody Keyboard";
-    serial                      = controller->GetSerial();
-    location                    = controller->GetLocation();
-
-    mode Direct;
-    Direct.name                 = "Direct";
-    Direct.value                = BLOODY_B820R_MODE_DIRECT;
-    Direct.flags                = MODE_FLAG_HAS_PER_LED_COLOR;
-    Direct.color_mode           = MODE_COLORS_PER_LED;
-    modes.push_back(Direct);
-
-    SetupZones();
-}
-
-RGBController_BloodyB820R::~RGBController_BloodyB820R()
-{
-    delete controller;
-}
-
-void RGBController_BloodyB820R::SetupZones()
-{
-    /*-------------------------------------------------*\
-    | Create the Keyboard zone and add the matrix map   |
-    \*-------------------------------------------------*/
-    zone KB_zone;
-    KB_zone.name                = ZONE_EN_KEYBOARD;
-    KB_zone.type                = ZONE_TYPE_MATRIX;
-    KB_zone.leds_min            = BLOODY_B820R_KEYCOUNT;
-    KB_zone.leds_max            = BLOODY_B820R_KEYCOUNT;
-    KB_zone.leds_count          = BLOODY_B820R_KEYCOUNT;
-
-    KB_zone.matrix_map          = new matrix_map_type;
-    KB_zone.matrix_map->height  = 6;
-    KB_zone.matrix_map->width   = 21;
-    KB_zone.matrix_map->map     = (unsigned int *)&matrix_map;
-    zones.push_back(KB_zone);
-
-    /*-------------------------------------------------*\
-    | Clear any existing color/LED configuration        |
-    \*-------------------------------------------------*/
-    leds.clear();
-    colors.clear();
-
-    /*---------------------------------------------------------*\
-    | Set up zones                                              |
-    \*---------------------------------------------------------*/
-    for(unsigned int led_index = 0; led_index < BLOODY_B820R_KEYCOUNT; led_index++)
-    {
-        led new_led;
-        new_led.name        = led_names[led_index];
-        new_led.value       = led_index;
-        leds.push_back(new_led);
-    }
-
-    SetupColors();
-}
-
-void RGBController_BloodyB820R::ResizeZone(int /*zone*/, int /*new_size*/)
-{
-    /*---------------------------------------------------------*\
-    | This device does not support resizing zones               |
-    \*---------------------------------------------------------*/
-}
-
-
-void RGBController_BloodyB820R::DeviceUpdateLEDs()
-{
-    controller->SetLEDDirect(colors);
-}
-
-void RGBController_BloodyB820R::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->SetLEDDirect(colour);
-}
-
-void RGBController_BloodyB820R::UpdateSingleLED(int led)
-{
-    std::vector<RGBColor> colour;
-    colour.push_back(colors[led]);
-
-    controller->SetLEDDirect(colour);
-}
-
-void RGBController_BloodyB820R::DeviceUpdateMode()
-{
-    /* This device does not support modes yet */
-}
@@ -1,32 +0,0 @@
-/*-------------------------------------------------------------------*\
-|  RGBController_BloodyB820R.h                                |
-|                                                                     |
-|  Driver for A4Tech Bloody B820R Keyboard Controller                   |
-|                                                                     |
-|  Mohammed Julfikar Ali Mahbub (o-julfikar)          01 Apr 2024     |
-|                                                                     |
-\*-------------------------------------------------------------------*/
-
-#pragma once
-#include "RGBController.h"
-#include "BloodyB820RController.h"
-#include <vector>
-
-class RGBController_BloodyB820R : public RGBController
-{
-public:
-    RGBController_BloodyB820R(BloodyB820RController* controller_ptr);
-    ~RGBController_BloodyB820R();
-
-    void    SetupZones();
-    void    ResizeZone(int zone, int new_size);
-
-    void    DeviceUpdateLEDs();
-    void    UpdateZoneLEDs(int zone);
-    void    UpdateSingleLED(int led);
-
-    void    DeviceUpdateMode();
-
-private:
-    BloodyB820RController* controller;
-};
@@ -1,21 +1,24 @@
-/*-----------------------------------------*\
-|  AMDWraithPrismController.h               |
-|                                           |
-|  Driver for AMD Wraith Prism RGB lighting |
-|  controller                               |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/6/2019   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| AMDWraithPrismController.cpp                              |
+|                                                           |
+|   Driver for AMD Wraith Prism                             |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                06 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

-#include "AMDWraithPrismController.h"
 #include <cstring>
 #include <stdio.h>
 #include <stdlib.h>
+#include "AMDWraithPrismController.h"
+#include "StringUtils.h"

 AMDWraithPrismController::AMDWraithPrismController(hid_device* dev_handle, const char* path)
 {
-    dev         = dev_handle;
-    location    = path;
+    dev                         = dev_handle;
+    location                    = path;

    current_fan_mode            = AMD_WRAITH_PRISM_FAN_LOGO_MODE_STATIC;
    current_fan_speed           = 0xFF;
@@ -53,10 +56,7 @@ std::string AMDWraithPrismController::GetSerialString()
        return("");
    }

-    std::wstring return_wstring = serial_string;
-    std::string return_string(return_wstring.begin(), return_wstring.end());
-
-    return(return_string);
+    return(StringUtils::wstring_to_string(serial_string));
 }

 std::string AMDWraithPrismController::GetFirmwareVersionString()
@@ -1,19 +1,20 @@
-/*-----------------------------------------*\
-|  AMDWraithPrismController.h               |
-|                                           |
-|  Definitions and types for AMD Wraith     |
-|  Prism lighting controller                |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/6/2019   |
-\*-----------------------------------------*/
-
-#include <string>
-#include <hidapi/hidapi.h>
-
-#include "RGBController.h"
+/*---------------------------------------------------------*\
+| AMDWraithPrismController.h                                |
+|                                                           |
+|   Driver for AMD Wraith Prism                             |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                06 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once

+#include <string>
+#include <hidapi.h>
+#include "RGBController.h"
+
 #define AMD_WRAITH_PRISM_FAN_BRIGHTNESS_DEFAULT_MAX     0xFF
 #define AMD_WRAITH_PRISM_FAN_BRIGHTNESS_CYCLE_MAX       0x7F

@@ -1,11 +1,29 @@
+/*---------------------------------------------------------*\
+| AMDWraithPrismControllerDetect.cpp                        |
+|                                                           |
+|   Detector for AMD Wraith Prism                           |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                06 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include <hidapi.h>
 #include "Detector.h"
 #include "AMDWraithPrismController.h"
 #include "RGBController.h"
 #include "RGBController_AMDWraithPrism.h"
-#include <hidapi/hidapi.h>

-#define AMD_WRAITH_PRISM_VID 0x2516
-#define AMD_WRAITH_PRISM_PID 0x0051
+/*---------------------------------------------------------*\
+| AMD Wraith Prism vendor ID                                |
+\*---------------------------------------------------------*/
+#define AMD_WRAITH_PRISM_VID                        0x2516
+
+/*---------------------------------------------------------*\
+| AMD Wraith Prism product ID                               |
+\*---------------------------------------------------------*/
+#define AMD_WRAITH_PRISM_PID                        0x0051

 /******************************************************************************************\
 *                                                                                          *
@@ -1,11 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_AMDWraithPrism.cpp         |
-|                                           |
-|  Generic RGB Interface for AMD Wraith     |
-|  Prism                                    |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/25/2019  |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AMDWraithPrism.cpp                          |
+|                                                           |
+|   RGBController for AMD Wraith Prism                      |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                25 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include "RGBController_AMDWraithPrism.h"

@@ -25,14 +27,14 @@

 RGBController_AMDWraithPrism::RGBController_AMDWraithPrism(AMDWraithPrismController* controller_ptr)
 {
-    controller  = controller_ptr;
+    controller                  = controller_ptr;

-    name        = "AMD Wraith Prism";
-    vendor      = "Cooler Master";
-    type        = DEVICE_TYPE_COOLER;
-    description = "AMD Wraith Prism Device";
-    version     = controller->GetFirmwareVersionString();
-    location    = controller->GetLocationString();
+    name                        = "AMD Wraith Prism";
+    vendor                      = "Cooler Master";
+    type                        = DEVICE_TYPE_COOLER;
+    description                 = "AMD Wraith Prism Device";
+    version                     = controller->GetFirmwareVersionString();
+    location                    = controller->GetLocationString();

    mode Direct;
    Direct.name                 = "Direct";
@@ -138,8 +140,8 @@ void RGBController_AMDWraithPrism::SetupZones()
    /*---------------------------------------------------------*\
    | LED maps                                                  |
    \*---------------------------------------------------------*/
-    const unsigned int logo_leds[1] =   { 0x00 };
-    const unsigned int fan_leds[1] =    { 0x01 };
+    const unsigned int logo_leds[1]  =  { 0x00 };
+    const unsigned int fan_leds[1]   =  { 0x01 };
    const unsigned int ring_leds[14] =  { 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x10, 0x0F,
                                          0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09 };

@@ -179,24 +181,24 @@ void RGBController_AMDWraithPrism::SetupZones()
    for(unsigned int led_idx = 0; led_idx < 1; led_idx++)
    {
        led logo_led;
-        logo_led.name = "Logo LED";
-        logo_led.value = logo_leds[led_idx];
+        logo_led.name       = "Logo LED";
+        logo_led.value      = logo_leds[led_idx];
        leds.push_back(logo_led);
    }

    for(unsigned int led_idx = 0; led_idx < 1; led_idx++)
    {
        led fan_led;
-        fan_led.name = "Fan LED";
-        fan_led.value = fan_leds[led_idx];
+        fan_led.name        = "Fan LED";
+        fan_led.value       = fan_leds[led_idx];
        leds.push_back(fan_led);
    }

    for(unsigned int led_idx = 0; led_idx < 14; led_idx++)
    {
        led ring_led;
-        ring_led.name = "Ring LED";
-        ring_led.value = ring_leds[led_idx];
+        ring_led.name       = "Ring LED";
+        ring_led.value      = ring_leds[led_idx];
        leds.push_back(ring_led);
    }

@@ -1,13 +1,16 @@
-/*-----------------------------------------*\
-|  RGBController_AMDWraithPrism.h           |
-|                                           |
-|  Generic RGB Interface for AMD Wraith     |
-|  Prism                                    |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/25/2019  |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AMDWraithPrism.h                            |
+|                                                           |
+|   RGBController for AMD Wraith Prism                      |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                25 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once
+
 #include "RGBController.h"
 #include "AMDWraithPrismController.h"

@@ -1,17 +1,19 @@
-/*-----------------------------------------*\
-|  AOCKeyboardController.cpp                |
-|                                           |
-|  Driver for AOC Keyboard lighting         |
-|  controller                               |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 5/10/2023   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| AOCKeyboardController.cpp                                 |
+|                                                           |
+|   Driver for AOC keyboard                                 |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                10 May 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

-#include "AOCKeyboardController.h"
-
-#include <cstring>
 #include <chrono>
+#include <cstring>
 #include <thread>
+#include "AOCKeyboardController.h"
+#include "StringUtils.h"

 using namespace std::chrono_literals;

@@ -41,10 +43,7 @@ std::string AOCKeyboardController::GetSerialString()
        return("");
    }

-    std::wstring return_wstring = serial_string;
-    std::string return_string(return_wstring.begin(), return_wstring.end());
-
-    return(return_string);
+    return(StringUtils::wstring_to_string(serial_string));
 }

 void AOCKeyboardController::SetLightingConfig
@@ -1,18 +1,20 @@
-/*-----------------------------------------*\
-|  AOCKeyboardController.h                  |
-|                                           |
-|  Definitions and types for AOC keyboard   |
-|  lighting controller                      |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 5/10/2023   |
-\*-----------------------------------------*/
-
-#include "RGBController.h"
-#include <hidapi/hidapi.h>
-#include <string>
+/*---------------------------------------------------------*\
+| AOCKeyboardController.h                                   |
+|                                                           |
+|   Driver for AOC keyboard                                 |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                10 May 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once

+#include <string>
+#include <hidapi.h>
+#include "RGBController.h"
+
 /*-----------------------------------------*\
 | AOC Keyboard Modes                        |
 \*-----------------------------------------*/
@@ -1,10 +1,21 @@
+/*---------------------------------------------------------*\
+| AOCKeyboardControllerDetect.cpp                           |
+|                                                           |
+|   Detector for AOC keyboard                               |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                10 May 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #include "Detector.h"
 #include "AOCKeyboardController.h"
 #include "RGBController.h"
 #include "RGBController_AOCKeyboard.h"

 /*-----------------------------------------------------*\
-| AOC Mousemat IDs                                      |
+| AOC Keyboard IDs                                      |
 \*-----------------------------------------------------*/
 #define AOC_VID                                     0x3938
 #define AOC_GK500_PID                               0x1178
@@ -33,4 +44,4 @@ void DetectAOCKeyboardControllers(hid_device_info* info, const std::string& name
 }

 REGISTER_HID_DETECTOR_PU("AOC GK500",  DetectAOCKeyboardControllers,   AOC_VID,    AOC_GK500_PID,   0xFF19, 0xFF19);
-REGISTER_HID_DETECTOR_PU("AOC GK500",  DetectAOCKeyboardControllers,   AOC_VID,    AOC_GK500_PID_2,   0xFF19, 0xFF19);
+REGISTER_HID_DETECTOR_PU("AOC GK500",  DetectAOCKeyboardControllers,   AOC_VID,    AOC_GK500_PID_2, 0xFF19, 0xFF19);
@@ -1,10 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_AOCKeyboard.cpp            |
-|                                           |
-|  Generic RGB Interface for AOC keyboard   |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 5/10/2023   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AOCKeyboard.cpp                             |
+|                                                           |
+|   RGBController for AOC keyboard                          |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                10 May 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include "RGBController_AOCKeyboard.h"
 #include "KeyboardLayoutManager.h"
@@ -32,10 +35,10 @@ layout_values aoc_keyboard_offset_values =
            75,   76,   91,   62,   48,   64,   50,   65,   66,   67,   97,   68,   84,   70,   59,   74,   89,    58,   73,   88,  103,
        /* TAB     Q     W     E     R     T     Y     U     I     O     P     [     ]     \   DEL   END   PGDN   NP7   NP8   NP9   NP+ */
            60,   61,   47,   78,   33,   49,   35,   80,   51,   52,   53,   69,   99,   25,   44,   29,   14,    43,   28,   13,  102,
-        /* CPLK    A     S     D     F     G     H     J     K     L     ;     "   ENTR                           NP4   NP5   NP6       */
-            45,   46,   32,   93,   18,   34,   20,   95,   36,   37,   38,   54,   10,                            57,   72,   87,
-        /* LSFT    Z     X     C     V     B     N     M     ,     .     /   RSFT                   ARWU          NP1   NP2   NP3  NPEN */
-            30,   31,   17,    2,    3,   19,    5,    6,   21,   22,   23,   39,                     11,          42,   27,   12,  101,
+        /* CPLK    A     S     D     F     G     H     J     K     L     ;     "     #   ENTR                     NP4   NP5   NP6       */
+            45,   46,   32,   93,   18,   34,   20,   95,   36,   37,   38,   54,    0,   10,                      57,   72,   87,
+        /* LSFT    \     Z     X     C     V     B     N     M     ,     .     /   RSFT             ARWU          NP1   NP2   NP3  NPEN */
+            30,    0,   31,   17,    2,    3,   19,    5,    6,   21,   22,   23,   39,               11,          42,   27,   12,  101,
        /* LCTL  LWIN  LALT               SPC              RALT  RFNC  RMNU  RCTL              ARWL ARWD   ARWR   NP0         NP.       */
            15,    0,    1,                4,                7,    8,   24,    9,               26,   41,   56,    71,         86
    },
@@ -47,14 +50,14 @@ layout_values aoc_keyboard_offset_values =

 RGBController_AOCKeyboard::RGBController_AOCKeyboard(AOCKeyboardController* controller_ptr)
 {
-    controller  = controller_ptr;
+    controller                      = controller_ptr;

-    name        = "AOC Keyboard Device";
-    vendor      = "AOC";
-    type        = DEVICE_TYPE_KEYBOARD;
-    description = "AOC Keyboard Device";
-    location    = controller->GetDeviceLocation();
-    serial      = controller->GetSerialString();
+    name                            = "AOC Keyboard Device";
+    vendor                          = "AOC";
+    type                            = DEVICE_TYPE_KEYBOARD;
+    description                     = "AOC Keyboard Device";
+    location                        = controller->GetDeviceLocation();
+    serial                          = controller->GetSerialString();

    mode Static;
    Static.name                     = "Static";
@@ -288,7 +291,7 @@ void RGBController_AOCKeyboard::SetupZones()
    | Create LEDs for the Matrix zone                           |
    |   Place keys in the layout to populate the matrix         |
    \*---------------------------------------------------------*/
-    for(size_t led_idx = 0; led_idx < new_zone.leds_count; led_idx++)
+    for(unsigned int led_idx = 0; led_idx < new_zone.leds_count; led_idx++)
    {
        led new_led;

@@ -299,8 +302,6 @@ void RGBController_AOCKeyboard::SetupZones()

    zones.push_back(new_zone);

-
-
    SetupColors();
 }

@@ -1,10 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_AOCKeyboard.h              |
-|                                           |
-|  Generic RGB Interface for AOC keyboard   |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 5/10/2023   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AOCKeyboard.h                               |
+|                                                           |
+|   RGBController for AOC keyboard                          |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                10 May 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once

@@ -1,14 +1,17 @@
-/*-----------------------------------------*\
-|  AOCMouseController.cpp                   |
-|                                           |
-|  Driver for AOC Mouse lighting controller |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 4/20/2023   |
-\*-----------------------------------------*/
-
-#include "AOCMouseController.h"
+/*---------------------------------------------------------*\
+| AOCMouseController.cpp                                    |
+|                                                           |
+|   Driver for AOC mouse                                    |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                20 Apr 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include <cstring>
+#include "AOCMouseController.h"
+#include "StringUtils.h"

 AOCMouseController::AOCMouseController(hid_device* dev_handle, const char* path)
 {
@@ -36,10 +39,7 @@ std::string AOCMouseController::GetSerialString()
        return("");
    }

-    std::wstring return_wstring = serial_string;
-    std::string return_string(return_wstring.begin(), return_wstring.end());
-
-    return(return_string);
+    return(StringUtils::wstring_to_string(serial_string));
 }

 /*-------------------------------------------------------------------------------------------------*\
@@ -1,18 +1,20 @@
-/*-----------------------------------------*\
-|  AOCMouseController.h                     |
-|                                           |
-|  Definitions and types for AOC mouse      |
-|  lighting controller                      |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 4/20/2023   |
-\*-----------------------------------------*/
-
-#include "RGBController.h"
-#include <hidapi/hidapi.h>
-#include <string>
+/*---------------------------------------------------------*\
+| AOCMouseController.h                                      |
+|                                                           |
+|   Driver for AOC mouse                                    |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                20 Apr 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once

+#include <string>
+#include <hidapi.h>
+#include "RGBController.h"
+
 /*-----------------------------------------*\
 | AOC Mousemat Modes                        |
 |   Note: The 0x80 bit is the random flag   |
@@ -1,10 +1,21 @@
+/*---------------------------------------------------------*\
+| AOCMouseControllerDetect.cpp                              |
+|                                                           |
+|   Detector for AOC mouse                                  |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                20 Apr 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #include "Detector.h"
 #include "AOCMouseController.h"
 #include "RGBController.h"
 #include "RGBController_AOCMouse.h"

 /*-----------------------------------------------------*\
-| AOC Mousemat IDs                                      |
+| AOC Mouse IDs                                         |
 \*-----------------------------------------------------*/
 #define AOC_VID                                     0x3938
 #define AOC_GM500_PID                               0x1179
@@ -1,10 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_AOCMouse.cpp               |
-|                                           |
-|  Generic RGB Interface for AOC mouse      |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 4/20/2023   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AOCMouse.cpp                                |
+|                                                           |
+|   RGBController for AOC mouse                             |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                20 Apr 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include "RGBController_AOCMouse.h"

@@ -21,14 +24,14 @@

 RGBController_AOCMouse::RGBController_AOCMouse(AOCMouseController* controller_ptr)
 {
-    controller  = controller_ptr;
+    controller                      = controller_ptr;

-    name        = "AOC Mouse Device";
-    vendor      = "AOC";
-    type        = DEVICE_TYPE_MOUSE;
-    description = "AOC Mouse Device";
-    location    = controller->GetDeviceLocation();
-    serial      = controller->GetSerialString();
+    name                            = "AOC Mouse Device";
+    vendor                          = "AOC";
+    type                            = DEVICE_TYPE_MOUSE;
+    description                     = "AOC Mouse Device";
+    location                        = controller->GetDeviceLocation();
+    serial                          = controller->GetSerialString();

    mode Direct;
    Direct.name                     = "Direct";
@@ -1,10 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_AOCMouse.h                 |
-|                                           |
-|  Generic RGB Interface for AOC mouse      |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 4/20/2023   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AOCMouse.h                                  |
+|                                                           |
+|   RGBController for AOC mouse                             |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                20 Apr 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once

@@ -1,15 +1,17 @@
-/*-----------------------------------------*\
-|  AOCMousematController.cpp                |
-|                                           |
-|  Driver for AOC Mousemat lighting         |
-|  controller                               |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 4/15/2023   |
-\*-----------------------------------------*/
-
-#include "AOCMousematController.h"
+/*---------------------------------------------------------*\
+| AOCMousematController.cpp                                 |
+|                                                           |
+|   Driver for AOC mousemat                                 |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Apr 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include <cstring>
+#include "AOCMousematController.h"
+#include "StringUtils.h"

 AOCMousematController::AOCMousematController(hid_device* dev_handle, const char* path)
 {
@@ -37,10 +39,7 @@ std::string AOCMousematController::GetSerialString()
        return("");
    }

-    std::wstring return_wstring = serial_string;
-    std::string return_string(return_wstring.begin(), return_wstring.end());
-
-    return(return_string);
+    return(StringUtils::wstring_to_string(serial_string));
 }

 /*-------------------------------------------------------------------------------------------------*\
@@ -1,18 +1,20 @@
-/*-----------------------------------------*\
-|  AOCMousematController.h                  |
-|                                           |
-|  Definitions and types for AOC mousemat   |
-|  lighting controller                      |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 4/15/2023   |
-\*-----------------------------------------*/
-
-#include "RGBController.h"
-#include <hidapi/hidapi.h>
-#include <string>
+/*---------------------------------------------------------*\
+| AOCMousematController.h                                   |
+|                                                           |
+|   Driver for AOC mousemat                                 |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Apr 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once

+#include <string>
+#include <hidapi.h>
+#include "RGBController.h"
+
 /*-----------------------------------------*\
 | AOC Mousemat Modes                        |
 |   Note: The 0x80 bit is the random flag   |
@@ -1,3 +1,14 @@
+/*---------------------------------------------------------*\
+| AOCMousematControllerDetect.cpp                           |
+|                                                           |
+|   Detector for AOC mousemat                               |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Apr 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #include "Detector.h"
 #include "AOCMousematController.h"
 #include "RGBController.h"
@@ -31,4 +42,4 @@ void DetectAOCMousematControllers(hid_device_info* info, const std::string& name
    }
 }

-REGISTER_HID_DETECTOR_IPU("AOC AGON AMM700",    DetectAOCMousematControllers,   AOC_VID,    AOC_AMM700_PID, 1,  0xFF19,  0xFF19);
+REGISTER_HID_DETECTOR_IPU("AOC AGON AMM700",    DetectAOCMousematControllers,   AOC_VID,    AOC_AMM700_PID, 1,  0xFF19,  0xFF19);
@@ -1,10 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_AOCMousemat.cpp            |
-|                                           |
-|  Generic RGB Interface for AOC mousemat   |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 4/15/2023   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AOCMousemat.cpp                             |
+|                                                           |
+|   RGBController for AOC mousemat                          |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Apr 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include "RGBController_AOCMousemat.h"

@@ -21,14 +24,14 @@

 RGBController_AOCMousemat::RGBController_AOCMousemat(AOCMousematController* controller_ptr)
 {
-    controller  = controller_ptr;
+    controller                      = controller_ptr;

-    name        = "AOC Mousemat Device";
-    vendor      = "AOC";
-    type        = DEVICE_TYPE_MOUSEMAT;
-    description = "AOC Mousemat Device";
-    location    = controller->GetDeviceLocation();
-    serial      = controller->GetSerialString();
+    name                            = "AOC Mousemat Device";
+    vendor                          = "AOC";
+    type                            = DEVICE_TYPE_MOUSEMAT;
+    description                     = "AOC Mousemat Device";
+    location                        = controller->GetDeviceLocation();
+    serial                          = controller->GetSerialString();

    mode Direct;
    Direct.name                     = "Direct";
@@ -1,10 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_AOCMousemat.h              |
-|                                           |
-|  Generic RGB Interface for AOC mousemat   |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 4/15/2023   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AOCMousemat.h                               |
+|                                                           |
+|   RGBController for AOC mousemat                          |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Apr 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once

@@ -1,20 +1,23 @@
-/*-----------------------------------------*\
-|  ASRockPolychromeUSBController.cpp        |
-|                                           |
-|  Driver for ASRock Polychrome USB         |
-|  lighting controller                      |
-|                                           |
-|  Ed Kambulow (dredvard) 12/20/2020        |
-|  Shady Nawara (ShadyNawara) 01/16/2023    |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| ASRockPolychromeUSBController.cpp                         |
+|                                                           |
+|   Driver for ASRock Polychrome USB motherboards           |
+|                                                           |
+|   Ed Kambulow (dredvard)                      20 Dec 2020 |
+|   Shady Nawara (ShadyNawara)                  16 Jan 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #include <cstring>
 #include <stdio.h>
-
 #include "RGBController.h"
 #include "ResourceManager.h"
 #include "SettingsManager.h"
+#include "StringUtils.h"
 #include "ASRockPolychromeUSBController.h"
-#include "dependencies/dmiinfo.h"
+#include "dmiinfo.h"

 #define POLYCHROME_USB_READ_ZONE_CONFIG 0x11
 #define POLYCHROME_USB_READ_HEADER      0x14
@@ -55,7 +58,7 @@ PolychromeUSBController::~PolychromeUSBController()

 unsigned int PolychromeUSBController::GetChannelCount()
 {
-    return(device_info.size());
+    return((unsigned int)device_info.size());
 }

 std::string PolychromeUSBController::GetDeviceLocation()
@@ -78,10 +81,7 @@ std::string PolychromeUSBController::GetSerialString()
        return("");
    }

-    std::wstring return_wstring = serial_string;
-    std::string return_string(return_wstring.begin(), return_wstring.end());
-
-    return(return_string);
+    return(StringUtils::wstring_to_string(serial_string));
 }

 void PolychromeUSBController::SetDeviceInfo()
@@ -381,7 +381,7 @@ void PolychromeUSBController::WriteRGSwap
    bool chnl8
    )
 {
-    unsigned char rgconfig[1] = {static_cast<unsigned char>(((chnl8 << 7) | (pcb << 6) | (io << 5) | (pch << 4) | (ahdr1 << 3) | (ahdr0 << 2) | (hdr1 << 1) | hdr0))};
+    unsigned char rgconfig[1] = {static_cast<unsigned char>((((unsigned char)chnl8 << 7) | ((unsigned char)pcb << 6) | ((unsigned char)io << 5) | ((unsigned char)pch << 4) | ((unsigned char)ahdr1 << 3) | ((unsigned char)ahdr0 << 2) | ((unsigned char)hdr1 << 1) | (unsigned char)hdr0))};
    WriteHeader(POLYCHROME_USB_RGSWAP_CFG, rgconfig, 1);
 }

@@ -1,19 +1,21 @@
-/*-----------------------------------------*\
-|  ASRockPolychromeUSBController.h          |
-|                                           |
-|  Driver for ASRock Polychrome USB         |
-|  lighting controller                      |
-|                                           |
-|  Ed Kambulow (dredvard) 12/20/2020        |
-|  Shady Nawara (ShadyNawara) 01/16/2023    |
-\*-----------------------------------------*/
-
-#include "RGBController.h"
-#include <hidapi/hidapi.h>
-#include <string>
+/*---------------------------------------------------------*\
+| ASRockPolychromeUSBController.h                           |
+|                                                           |
+|   Driver for ASRock Polychrome USB motherboards           |
+|                                                           |
+|   Ed Kambulow (dredvard)                      20 Dec 2020 |
+|   Shady Nawara (ShadyNawara)                  16 Jan 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once

+#include <string>
+#include <hidapi.h>
+#include "RGBController.h"
+
 /*----------------------------------------------------------------------------------------------*\
 | Definitions for Polychrome USB                                                                 |
 \*----------------------------------------------------------------------------------------------*/
@@ -154,12 +156,11 @@ protected:
        );

 private:
-    unsigned int  led_count;
    std::string   device_name;
    unsigned char configtable[12];
    bool          rgswapconfig[8] = { 0 };

-    void SetDeviceInfo();    
+    void SetDeviceInfo();
    void ReadConfigTables();
    void Commit();
 };
@@ -1,13 +1,25 @@
+/*---------------------------------------------------------*\
+| ASRockPolychromeUSBControllerDetect.cpp                   |
+|                                                           |
+|   Detector for ASRock Polychrome USB motherboards         |
+|                                                           |
+|   Ed Kambulow (dredvard)                      20 Dec 2020 |
+|   Shady Nawara (ShadyNawara)                  16 Jan 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <vector>
+#include <hidapi.h>
 #include "Detector.h"
 #include "ASRockPolychromeUSBController.h"
 #include "RGBController.h"
 #include "RGBController_ASRockPolychromeUSB.h"
 #include "i2c_smbus.h"
 #include "pci_ids.h"
-#include <vector>
-#include <stdio.h>
-#include <stdlib.h>
-#include <hidapi/hidapi.h>

 /*---------------------------------------------------------*\
 | ASRock vendor ID                                          |
@@ -32,5 +44,5 @@ void DetectPolychromeUSBControllers(hid_device_info* info, const std::string& /*
    }
 }

-REGISTER_HID_DETECTOR("ASRock Polychrome USB", DetectPolychromeUSBControllers, ASROCK_VID, ASROCK_MOTHERBOARD_1_PID);
-REGISTER_HID_DETECTOR("ASRock Deskmini Addressable LED Strip", DetectPolychromeUSBControllers, ASROCK_VID, ASROCK_DESKMINI_ADDRESSABLE_LED_STRIP_PID);
+REGISTER_HID_DETECTOR("ASRock Polychrome USB",                  DetectPolychromeUSBControllers, ASROCK_VID, ASROCK_MOTHERBOARD_1_PID);
+REGISTER_HID_DETECTOR("ASRock Deskmini Addressable LED Strip",  DetectPolychromeUSBControllers, ASROCK_VID, ASROCK_DESKMINI_ADDRESSABLE_LED_STRIP_PID);
@@ -1,15 +1,17 @@
-/*-----------------------------------------*\
-|  RGBController_ASRockPolychromeUSB.cpp    |
-|                                           |
-|  Generic RGB Interface for OpenRGB        |
-|  ASRock Polychrome USB Driver             |
-|                                           |
-|  Ed Kambulow (Dredvard) 12/26/2020        |
-|  Shady Nawara (ShadyNawara) 01/16/2023    |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_ASRockPolychromeUSB.cpp                     |
+|                                                           |
+|   RGBController for ASRock Polychrome USB motherboards    |
+|                                                           |
+|   Ed Kambulow (dredvard)                      20 Dec 2020 |
+|   Shady Nawara (ShadyNawara)                  16 Jan 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

-#include "RGBController_ASRockPolychromeUSB.h"
 #include <string.h>
+#include "RGBController_ASRockPolychromeUSB.h"

 #define ASROCK_USB_MAX_ZONES        8
 #define ASROCK_ADDRESSABLE_MAX_LEDS 100
@@ -293,7 +295,7 @@ void RGBController_PolychromeUSB::DeviceUpdateLEDs()
            set_mode = active_mode;
        }

-        controller->WriteZone(zone_idx, set_mode, zones_info[zone_idx].speed, zones[zone_idx].colors[0], false);
+        controller->WriteZone((unsigned char)zone_idx, set_mode, zones_info[zone_idx].speed, zones[zone_idx].colors[0], false);
    }
 }

@@ -1,12 +1,14 @@
-/*-----------------------------------------*\
-|  RGBController_ASRockPolychromeUSB.h      |
-|                                           |
-|  Generic RGB Interface for OpenRGB        |
-|  ASRock Polychrome USB Driver             |
-|                                           |
-|  Ed Kambulow (Dredvard) 12/26/2020        |
-|  Shady Nawara (ShadyNawara) 01/16/2023    |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_ASRockPolychromeUSB.h                       |
+|                                                           |
+|   RGBController for ASRock Polychrome USB motherboards    |
+|                                                           |
+|   Ed Kambulow (dredvard)                      20 Dec 2020 |
+|   Shady Nawara (ShadyNawara)                  16 Jan 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once

@@ -29,7 +31,6 @@ public:
    void        DeviceUpdateMode();

 private:
-    bool                            initializedMode;
    PolychromeUSBController*        controller;
    std::vector<PolychromeZoneInfo> zones_info;

@@ -1,15 +1,17 @@
-/*-----------------------------------------*\
-|  ASRockPolychromeSMBusController.cpp      |
-|                                           |
-|  Driver for for ASRock ASR LED and        |
-|  Polychrome RGB lighting controller       |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/14/2019  |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| ASRockASRRGBSMBusController.cpp                           |
+|                                                           |
+|   Driver for SMBus ASRock ASR RGB motherboards            |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                14 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include "ASRockASRRGBSMBusController.h"
 #include <cstring>
-#include "dependencies/dmiinfo.h"
+#include "dmiinfo.h"
 #include "LogManager.h"

 #define ASROCK_ZONE_LED_COUNT_MESSAGE_EN    "[%s] Zone %i LED count: %02d"
@@ -64,7 +66,7 @@ void ASRockASRRGBSMBusController::SetColorsAndSpeed(uint8_t led, uint8_t red, ui
 {
    uint8_t color_speed_pkt[4] = { red, green, blue, active_speed };
    uint8_t select_led_pkt[1]  = { led };
-    
+
    /*-----------------------------------------------------*\
    | Select LED                                            |
    \*-----------------------------------------------------*/
@@ -1,18 +1,19 @@
-/*-----------------------------------------*\
-|  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>
+/*---------------------------------------------------------*\
+| ASRockASRRGBSMBusController.h                             |
+|                                                           |
+|   Driver for SMBus ASRock ASR RGB motherboards            |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                13 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once

+#include <string>
+#include "i2c_smbus.h"
+
 typedef uint8_t	polychrome_dev_id;

 #define ASROCK_ASR_CONTROLLER_NAME  "ASRock ASR RGB SMBus Controller"
@@ -63,7 +64,7 @@ public:
    uint8_t                 GetMode();
    void                    SetColorsAndSpeed(uint8_t led, uint8_t red, uint8_t green, uint8_t blue);
    void                    SetMode(uint8_t zone, uint8_t mode, uint8_t speed);
-    
+
    uint16_t                fw_version;

 private:
@@ -1,11 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_ASRockPolychromeSMBus.cpp  |
-|                                           |
-|  Generic RGB Interface for OpenRGB        |
-|  ASRock ASR LED and Polychrome RGB Driver |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/15/2019  |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_ASRRGBSMBus.cpp                             |
+|                                                           |
+|   RGBController for SMBus ASRock ASR LED motherboards     |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include "RGBController_ASRockASRRGBSMBus.h"

@@ -167,7 +169,7 @@ void RGBController_ASRockASRRGBSMBus::ResizeZone(int /*zone*/, int /*new_size*/)

 void RGBController_ASRockASRRGBSMBus::DeviceUpdateLEDs()
 {
-    for (std::size_t led = 0; led < colors.size(); led++)
+    for(unsigned int led = 0; led < colors.size(); led++)
    {
        UpdateSingleLED(led);
    }
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------*\
+| RGBController_ASRRGBSMBus.h                               |
+|                                                           |
+|   RGBController for SMBus ASRock ASR RGB motherboards     |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "ASRockASRRGBSMBusController.h"
+
+class RGBController_ASRockASRRGBSMBus : public RGBController
+{
+public:
+    RGBController_ASRockASRRGBSMBus(ASRockASRRGBSMBusController* controller_ptr);
+    ~RGBController_ASRockASRRGBSMBus();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+private:
+    ASRockASRRGBSMBusController* controller;
+};
@@ -1,15 +1,17 @@
-/*-----------------------------------------*\
-|  ASRockPolychromeV1SMBusController.cpp    |
-|                                           |
-|  Driver for for ASRock ASR LED and        |
-|  Polychrome RGB lighting controller       |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/14/2019  |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| ASRockPolychromeV1SMBusController.cpp                     |
+|                                                           |
+|   Driver for SMBus ASRock Polychrome V1 motherboards      |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                14 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

-#include "ASRockPolychromeV1SMBusController.h"
 #include <cstring>
-#include "dependencies/dmiinfo.h"
+#include "ASRockPolychromeV1SMBusController.h"
+#include "dmiinfo.h"
 #include "LogManager.h"

 #define ASROCK_ZONE_LED_COUNT_MESSAGE_EN    "[%s] Zone %i LED count: %02d"
@@ -1,19 +1,20 @@
-/*-----------------------------------------*\
-|  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>
+/*---------------------------------------------------------*\
+| ASRockPolychromeV1SMBusController.h                       |
+|                                                           |
+|   Driver for SMBus ASRock Polychrome V1 motherboards      |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                13 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once

+#include <string>
+#include "i2c_smbus.h"
+#include "RGBController.h"
+
 typedef uint8_t	polychrome_dev_id;

 #define ASROCK_V1_CONTROLLER_NAME  "ASRock Polychrome v1 SMBus Controller"
@@ -1,11 +1,14 @@
-/*-----------------------------------------*\
-|  RGBController_ASRockPolychromeSMBus.cpp  |
-|                                           |
-|  Generic RGB Interface for OpenRGB        |
-|  ASRock ASR LED and Polychrome RGB Driver |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/15/2019  |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_ASRockPolychromeV1SMBus.cpp                 |
+|                                                           |
+|   RGBController for SMBus ASRock Polychrome V1            |
+|   motherboards                                            |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include "LogManager.h"
 #include "RGBController_ASRockPolychromeV1SMBus.h"
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------*\
+| RGBController_ASRockPolychromeV1SMBus.h                   |
+|                                                           |
+|   RGBController for SMBus ASRock Polychrome V1            |
+|   motherboards                                            |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#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;
+};
@@ -1,15 +1,17 @@
-/*-----------------------------------------*\
-|  ASRockPolychromeV2SMBusController.cpp    |
-|                                           |
-|  Driver for for ASRock ASR LED and        |
-|  Polychrome RGB lighting controller       |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/14/2019  |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| ASRockPolychromeV2SMBusController.cpp                     |
+|                                                           |
+|   Driver for SMBus ASRock Polychrome V2 motherboards      |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                14 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

-#include "ASRockPolychromeV2SMBusController.h"
 #include <cstring>
-#include "dependencies/dmiinfo.h"
+#include "ASRockPolychromeV2SMBusController.h"
+#include "dmiinfo.h"
 #include "LogManager.h"

 #define ASROCK_ZONE_LED_COUNT_MESSAGE_EN    "[%s] Zone %i LED count: %02d"
@@ -1,18 +1,19 @@
-/*-----------------------------------------*\
-|  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>
+/*---------------------------------------------------------*\
+| ASRockPolychromeV2SMBusController.h                       |
+|                                                           |
+|   Driver for SMBus ASRock Polychrome V2 motherboards      |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                13 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once

+#include <string>
+#include "i2c_smbus.h"
+
 typedef uint8_t polychrome_dev_id;

 #define ASROCK_V2_CONTROLLER_NAME  "ASRock Polychrome v2 SMBus Controller"
@@ -132,7 +133,7 @@ public:

    uint8_t                 zone_led_count[6];
    uint16_t                fw_version;
-    
+
 private:
    std::string             device_name;
    uint8_t                 active_zone;
@@ -1,11 +1,14 @@
-/*-----------------------------------------*\
-|  RGBController_ASRockPolychromeV2SMBus.cpp|
-|                                           |
-|  Generic RGB Interface for OpenRGB        |
-|  ASRock ASR LED and Polychrome RGB Driver |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/15/2019  |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_ASRockPolychromeV2SMBus.cpp                 |
+|                                                           |
+|   RGBController for SMBus ASRock Polychrome V2            |
+|   motherboards                                            |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include "RGBController_ASRockPolychromeV2SMBus.h"

@@ -287,7 +290,7 @@ void RGBController_ASRockPolychromeV2SMBus::ResizeZone(int /*zone*/, int /*new_s

 void RGBController_ASRockPolychromeV2SMBus::DeviceUpdateLEDs()
 {
-    for (std::size_t led = 0; led < colors.size(); led++)
+    for(unsigned int led = 0; led < colors.size(); led++)
    {
        UpdateSingleLED(led);
    }
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------*\
+| RGBController_ASRockPolychromeV2SMBus.h                   |
+|                                                           |
+|   RGBController for SMBus ASRock Polychrome V2            |
+|   motherboards                                            |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#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;
+};
@@ -1,3 +1,18 @@
+/*---------------------------------------------------------*\
+| ASRockSMBusControllerDetect.cpp                           |
+|                                                           |
+|   Detector for SMBus ASRock ASR RGB and Polychrome        |
+|   motherboards                                            |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                14 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <vector>
 #include "Detector.h"
 #include "ASRockASRRGBSMBusController.h"
 #include "ASRockPolychromeV1SMBusController.h"
@@ -9,9 +24,6 @@
 #include "RGBController_ASRockPolychromeV2SMBus.h"
 #include "i2c_smbus.h"
 #include "pci_ids.h"
-#include <vector>
-#include <stdio.h>
-#include <stdlib.h>

 /*******************************************************************************************\
 *                                                                                           *
@@ -1,33 +0,0 @@
-/*-----------------------------------------*\
-|  RGBController_ASRockPolychromeSMBus.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 "ASRockASRRGBSMBusController.h"
-
-class RGBController_ASRockASRRGBSMBus : public RGBController
-{
-public:
-    RGBController_ASRockASRRGBSMBus(ASRockASRRGBSMBusController* controller_ptr);
-    ~RGBController_ASRockASRRGBSMBus();
-
-    void        SetupZones();
-
-    void        ResizeZone(int zone, int new_size);
-
-    void        DeviceUpdateLEDs();
-    void        UpdateZoneLEDs(int zone);
-    void        UpdateSingleLED(int led);
-
-    void        DeviceUpdateMode();
-
-private:
-    ASRockASRRGBSMBusController* controller;
-};
@@ -1,35 +0,0 @@
-/*-----------------------------------------*\
-|  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;
-};
@@ -1,33 +0,0 @@
-/*-----------------------------------------*\
-|  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;
-};
@@ -1,13 +1,14 @@
-/*-----------------------------------------*\
-|  AlienwareController.cpp                  |
-|                                           |
-|  Driver for Alienware lighting controller |
-|                                           |
-|  Gabriel Marcano (gemarcano) 4/21/2021    |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| AlienwareController.cpp                                   |
+|                                                           |
+|   Driver for Dell Alienware RGB USB controller            |
+|                                                           |
+|   Gabriel Marcano (gemarcano)                 21 Apr 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

-#include "RGBController.h"
-#include "AlienwareController.h"
 #include <cstring>
 #include <cstdint>
 #include <map>
@@ -15,7 +16,10 @@
 #include <chrono>
 #include <algorithm>
 #include <sstream>
+#include "RGBController.h"
+#include "AlienwareController.h"
 #include "LogManager.h"
+#include "StringUtils.h"

 typedef uint32_t alienware_platform_id;

@@ -27,7 +31,8 @@ static const std::map<alienware_platform_id, uint8_t> zone_quirks_table =
 {
    { 0x0C01,   4 },    // Dell G5 SE 5505
    { 0x0A01,  16 },    // Dell G7 15 7500
-    { 0x0E03,   4 }     // Dell G15   5511
+    { 0x0E03,   4 },    // Dell G15   5511
+    { 0x0E0A,   4 }     // Dell G15   5530

 };

@@ -43,7 +48,8 @@ static const std::map<alienware_platform_id, std::vector<const char*>> zone_name
                  "Light Bar 4",    "Light Bar 5",  "Light Bar 6",
                  "Light Bar 7",    "Light Bar 8",  "Light Bar 9",
                  "Light Bar 10",   "Light Bar 11", "Light Bar 12"              } },
-    { 0x0E03,   { "Left",           "Middle",       "Right",        "Numpad"    } }
+    { 0x0E03,   { "Left",           "Middle",       "Right",        "Numpad"    } },
+    { 0x0E0A,   { "Left",           "Middle",       "Right",        "Numpad"    } }
 };

 static void SendHIDReport(hid_device *dev, const unsigned char* usb_buf, size_t usb_buf_size)
@@ -84,9 +90,7 @@ AlienwareController::AlienwareController(hid_device* dev_handle, const hid_devic
    /*-----------------------------------------------------*\
    | Get serial number                                     |
    \*-----------------------------------------------------*/
-    std::wstring tmp_serial_number;
-    tmp_serial_number   = info.serial_number;
-    serial_number       = std::string(tmp_serial_number.begin(), tmp_serial_number.end());
+    serial_number       = StringUtils::wstring_to_string(info.serial_number);

    /*-----------------------------------------------------*\
    | Get zone information by checking firmware             |
@@ -167,7 +171,7 @@ AlienwareController::~AlienwareController()

 unsigned int AlienwareController::GetZoneCount()
 {
-    return(zones.size());
+    return((unsigned int)zones.size());
 }

 std::vector<const char*> AlienwareController::GetZoneNames()
@@ -272,7 +276,7 @@ bool AlienwareController::Dim(std::vector<uint8_t> zones, double percent)
    /*-----------------------------------------------------*\
    | Set up message packet with leading 00, per hidapi     |
    \*-----------------------------------------------------*/
-    uint16_t num_zones  = zones.size();
+    uint16_t num_zones  = (uint16_t)zones.size();

    usb_buf[0x00]       = 0x00;
    usb_buf[0x01]       = 0x03;
@@ -376,7 +380,7 @@ bool AlienwareController::SelectZones(const std::vector<uint8_t>& zones)
    /*-----------------------------------------------------*\
    | Set up message packet with leading 00, per hidapi     |
    \*-----------------------------------------------------*/
-    uint16_t num_zones  = zones.size();
+    uint16_t num_zones  = (uint16_t)zones.size();

    usb_buf[0x00]       = 0x00;
    usb_buf[0x01]       = 0x03;
@@ -515,7 +519,7 @@ bool AlienwareController::SetColorDirect(RGBColor color, std::vector<uint8_t> zo
    /*-----------------------------------------------------*\
    | Set up message packet with leading 00, per hidapi     |
    \*-----------------------------------------------------*/
-    uint16_t num_zones      = zones.size();
+    uint16_t num_zones      = (uint16_t)zones.size();

    usb_buf[0x00]           = 0x00;
    usb_buf[0x01]           = 0x03;
@@ -651,7 +655,7 @@ void AlienwareController::UpdateDim()

    for(size_t i = 0; i < zones.size(); i++)
    {
-        dim_zone_map[zones[i].dim].emplace_back(i);
+        dim_zone_map[zones[i].dim].emplace_back((uint8_t)i);
    }

    for(std::pair<const uint8_t, std::vector<uint8_t>> &pair : dim_zone_map)
@@ -678,7 +682,7 @@ bool AlienwareController::UpdateDirect()

    for(size_t i = 0; i < zones.size(); i++)
    {
-        color_zone_map[zones[i].color[0]].emplace_back(i);
+        color_zone_map[zones[i].color[0]].emplace_back((uint8_t)i);
    }

    for(std::pair<const RGBColor, std::vector<uint8_t>> &pair : color_zone_map)
@@ -1,18 +1,20 @@
-/*-----------------------------------------*\
-|  AlienwareController.h                    |
-|                                           |
-|  Driver for Dell Alienware RGB USB        |
-|  controller                               |
-|                                           |
-|  Gabriel Marcano (gemarcano) 4/19/2021    |
-\*-----------------------------------------*/
-
-#include "RGBController.h"
-#include <hidapi/hidapi.h>
-#include <string>
+/*---------------------------------------------------------*\
+| AlienwareController.h                                     |
+|                                                           |
+|   Driver for Dell Alienware RGB USB controller            |
+|                                                           |
+|   Gabriel Marcano (gemarcano)                 19 Apr 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once

+#include <string>
+#include <hidapi.h>
+#include "RGBController.h"
+
 /*----------------------------------------------------------------------------------------------*\
 | Definitions for Alienware Controller                                                           |
 \*----------------------------------------------------------------------------------------------*/
@@ -1,3 +1,12 @@
+/*---------------------------------------------------------*\
+| AlienwareControllerDetect.cpp                             |
+|                                                           |
+|   Detector for Dell Alienware RGB USB controller          |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #include "Detector.h"
 #include "AlienwareController.h"
 #include "RGBController.h"
@@ -11,7 +20,8 @@
 /*---------------------------------------------------------*\
 | Alienware product ID                                      |
 \*---------------------------------------------------------*/
-#define ALIENWARE_G_SERIES_PID                         0x0550
+#define ALIENWARE_G_SERIES_PID1                      0x0550
+#define ALIENWARE_G_SERIES_PID2                      0x0551

 void DetectAlienwareControllers(hid_device_info* info, const std::string& name)
 {
@@ -26,4 +36,5 @@ void DetectAlienwareControllers(hid_device_info* info, const std::string& name)
    }
 }

-REGISTER_HID_DETECTOR("Dell G Series LED Controller", DetectAlienwareControllers, ALIENWARE_VID, ALIENWARE_G_SERIES_PID);
+REGISTER_HID_DETECTOR("Dell G Series LED Controller", DetectAlienwareControllers, ALIENWARE_VID, ALIENWARE_G_SERIES_PID1);
+REGISTER_HID_DETECTOR("Dell G Series LED Controller", DetectAlienwareControllers, ALIENWARE_VID, ALIENWARE_G_SERIES_PID2);
@@ -1,16 +1,17 @@
-/*-----------------------------------------*\
-|  RGBController_Alienware.cpp              |
-|                                           |
-|  Generic RGB Interface for OpenRGB        |
-|  Alienware USB Driver                     |
-|                                           |
-|  Gabriel Marcano (gemarcano) 4/19/2021    |
-\*-----------------------------------------*/
-
-#include "RGBController_Alienware.h"
+/*---------------------------------------------------------*\
+| RGBController_Alienware.cpp                               |
+|                                                           |
+|   RGBController for Dell Alienware RGB USB controller     |
+|                                                           |
+|   Gabriel Marcano (gemarcano)                 19 Apr 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include <thread>
 #include <chrono>
+#include "RGBController_Alienware.h"

 /**------------------------------------------------------------------*\
    @name Alienware
@@ -213,7 +214,7 @@ void RGBController_Alienware::DeviceUpdateMode()
        /*-----------------------------------------------------*\
        | Setup state per zone                                  |
        \*-----------------------------------------------------*/
-        for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
+        for(uint8_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
        {
            zone current_zone = zones[zone_idx];

@@ -1,19 +1,20 @@
-/*-----------------------------------------*\
-|  RGBController_Alienware.h                |
-|                                           |
-|  Generic RGB Interface for OpenRGB        |
-|  Alienware RGB USB Driver                 |
-|                                           |
-|  Gabriel Marcano (gemarcano) 4/19/2021    |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_Alienware.h                                 |
+|                                                           |
+|   RGBController for Dell Alienware RGB USB controller     |
+|                                                           |
+|   Gabriel Marcano (gemarcano)                 19 Apr 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once

+#include <chrono>
 #include "RGBController.h"
 #include "AlienwareController.h"

-#include <chrono>
-
 class RGBController_Alienware : public RGBController
 {
 public:
@@ -1,16 +1,18 @@
-/*------------------------------------------------------*\
-|  AlienwareAW410KController.cpp                         |
-|                                                        |
-|  Driver for Alienware AW410K                           |
-|  keyboard light controller                             |
-|                                                        |
-|  based on AW510K controller by Mohamad Sallal - msallal|
-|                                                        |
-|  Dominik Mikolajczyk - dmiko 23/10/2023                |
-\*------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| AlienwareAW410KController.cpp                             |
+|                                                           |
+|   Driver for Alienware AW410K keyboard                    |
+|                                                           |
+|   based on AW510K controller by Mohamad Sallal (msallal)  |
+|   Dominik Mikolajczyk (dmiko)                 23 Oct 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

-#include "AlienwareAW410KController.h"
 #include <cstring>
+#include "AlienwareAW410KController.h"
+#include "StringUtils.h"

 AlienwareAW410KController::AlienwareAW410KController(hid_device* dev_handle, const char* path)
 {
@@ -34,20 +36,18 @@ std::string AlienwareAW410KController::GetSerialString()
 {
    wchar_t serial_string[128];
    int ret = hid_get_serial_number_string(dev, serial_string, 128);
+
    if(ret != 0)
    {
        return("");
    }

-    std::wstring return_wstring = serial_string;
-    std::string return_string(return_wstring.begin(), return_wstring.end());
-
-    return(return_string);
+    return(StringUtils::wstring_to_string(serial_string));
 }

 void AlienwareAW410KController::SendCommit()
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -69,7 +69,7 @@ void AlienwareAW410KController::SendCommit()
    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);

    /*-----------------------------------------------------*\
    | Delay 20 milliseconds                                 |
@@ -77,7 +77,6 @@ void AlienwareAW410KController::SendCommit()
    std::this_thread::sleep_for(std::chrono::milliseconds(20));
 }

-
 void AlienwareAW410KController::SendfeatureReport
    (
    unsigned char   first_byte,
@@ -86,7 +85,7 @@ void AlienwareAW410KController::SendfeatureReport
    unsigned char   forth_byte
    )
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -105,7 +104,7 @@ void AlienwareAW410KController::SendfeatureReport
    /*-----------------------------------------------------*\
    | Send Feature report packet                            |
    \*-----------------------------------------------------*/
-    hid_send_feature_report(dev, (unsigned char *)usb_buf, 65);
+    hid_send_feature_report(dev, usb_buf, 65);

    /*-----------------------------------------------------*\
    | Delay 10 milliseconds                                 |
@@ -115,7 +114,7 @@ void AlienwareAW410KController::SendfeatureReport

 void AlienwareAW410KController::SendEdit()
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -133,7 +132,7 @@ void AlienwareAW410KController::SendEdit()
    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);

    /*-----------------------------------------------------*\
    | Delay 2 milliseconds                                  |
@@ -143,7 +142,7 @@ void AlienwareAW410KController::SendEdit()

 void AlienwareAW410KController::SendInitialize()
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -168,7 +167,7 @@ void AlienwareAW410KController::SendInitialize()
    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);

    /*-----------------------------------------------------*\
    | Delay 2 milliseconds                                  |
@@ -222,7 +221,7 @@ void AlienwareAW410KController::SendDirectOn
    std::vector<SelectedButtons>     &frame_data
    )
 {
-    SendfeatureReport(0x0E, frame_data.size(), 0x00, 0x01);
+    SendfeatureReport(0x0E, (unsigned char)frame_data.size(), 0x00, 0x01);

    /*-----------------------------------------------*\
    | To Guarantee the data are always %4 =0 append   |
@@ -302,7 +301,7 @@ void AlienwareAW410KController::SendDirectOn
 void AlienwareAW410KController::SetMode
    (
    unsigned char   mode,
-    unsigned short  speed,
+    unsigned char   speed,
    unsigned char   direction,
    unsigned char   colorMode,
    unsigned char   red,
@@ -324,7 +323,7 @@ void AlienwareAW410KController::UpdateSingleLED
 {
    SendfeatureReport(0x0E, 0x01, 0x00, 0x01);

-    char usb_buf[65];
+    unsigned char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -354,7 +353,7 @@ void AlienwareAW410KController::UpdateSingleLED
    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);

    /*-----------------------------------------------------*\
    | Delay 20 milliseconds                                 |
@@ -366,7 +365,7 @@ void AlienwareAW410KController::SendMode
    (
    unsigned char   /*zone*/,
    unsigned char   mode,
-    unsigned short  speed,
+    unsigned char   speed,
    unsigned char   direction,
    unsigned char   colorMode,
    unsigned char   red,
@@ -374,7 +373,7 @@ void AlienwareAW410KController::SendMode
    unsigned char   blue
    )
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -400,13 +399,13 @@ void AlienwareAW410KController::SendMode
    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);
 }

 void AlienwareAW410KController::SetMorphMode
    (
    unsigned char   mode,
-    unsigned short  speed,
+    unsigned char   speed,
    unsigned char   red1,
    unsigned char   green1,
    unsigned char   blue1,
@@ -415,7 +414,7 @@ void AlienwareAW410KController::SetMorphMode
    unsigned char   blue2
    )
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -444,5 +443,5 @@ void AlienwareAW410KController::SetMorphMode
    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);
 }
@@ -1,21 +1,21 @@
-/*------------------------------------------------------*\
-|  AlienwareAW410KController.h                           |
-|                                                        |
-|  Definitions and types for alienware                   |
-|  AW410K Keyboard                                       |
-|                                                        |
-|  based on AW510K controller by Mohamad Sallal - msallal|
-|                                                        |
-|  Dominik Mikolajczyk - dmiko 23/10/2023                |
-\*------------------------------------------------------*/
-
-#include "RGBController.h"
-
-#include <string>
-#include <hidapi/hidapi.h>
+/*---------------------------------------------------------*\
+| AlienwareAW410KController.h                               |
+|                                                           |
+|   Driver for Alienware AW410K keyboard                    |
+|                                                           |
+|   based on AW510K controller by Mohamad Sallal (msallal)  |
+|   Dominik Mikolajczyk (dmiko)                 23 Oct 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once

+#include <string>
+#include <hidapi.h>
+#include "RGBController.h"
+
 enum
 {
    ALIENWARE_AW410K_ZONE_MODE_KEYBOARD         = 0x01,
@@ -109,7 +109,7 @@ public:
    void        SetMode
                    (
                    unsigned char   mode,
-                    unsigned short  speed,
+                    unsigned char   speed,
                    unsigned char   direction,
                    unsigned char   colorMode,
                    unsigned char   red,
@@ -120,7 +120,7 @@ public:
    void        SetMorphMode
                    (
                    unsigned char   mode,
-                    unsigned short  speed,
+                    unsigned char   speed,
                    unsigned char   red1,
                    unsigned char   green1,
                    unsigned char   blue1,
@@ -145,7 +145,7 @@ private:
                    (
                    unsigned char   zone,
                    unsigned char   mode,
-                    unsigned short  speed,
+                    unsigned char   speed,
                    unsigned char   direction,
                    unsigned char   colorMode,
                    unsigned char   red,
@@ -1,17 +1,18 @@
-/*------------------------------------------------------*\
-|  RGBController_AlienwareAW410K.cpp                     |
-|                                                        |
-|  Generic RGB Interface for alienware                   |
-|  AW410K Keyboard                                       |
-|                                                        |
-|  based on AW510K controller by Mohamad Sallal - msallal|
-|                                                        |
-|  Dominik Mikolajczyk - dmiko 23/10/2023                |
-\*------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AlienwareAW410K.cpp                         |
+|                                                           |
+|   RGBController for Alienware AW410K keyboard             |
+|                                                           |
+|   based on AW510K controller by Mohamad Sallal (msallal)  |
+|   Dominik Mikolajczyk (dmiko)                 23 Oct 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

+#include <iterator>
 #include "RGBControllerKeyNames.h"
 #include "RGBController_AlienwareAW410K.h"
-#include <iterator>

 //0xFFFFFFFF indicates an unused entry in matrix
 #define NA  0xFFFFFFFF
@@ -410,7 +411,7 @@ void RGBController_AlienwareAW410K::DeviceUpdateMode()
            | Load LEDs again in case of profile load etc.                  |
            \*-------------------------------------------------------------*/
            DeviceUpdateLEDs();
-            break;  
+            break;
        case ALIENWARE_AW410K_MODE_MORPH:
            /*-------------------------------------------------------------*\
            | In case of morph it requires two colors (color1 and color2)   |
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------*\
+| RGBController_AlienwareAW410K.h                           |
+|                                                           |
+|   RGBController for Alienware AW410K keyboard             |
+|                                                           |
+|   based on AW510K controller by Mohamad Sallal (msallal)  |
+|   Dominik Mikolajczyk (dmiko)                 23 Oct 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "AlienwareAW410KController.h"
+
+class RGBController_AlienwareAW410K : public RGBController
+{
+public:
+    RGBController_AlienwareAW410K(AlienwareAW410KController* controller_ptr);
+    ~RGBController_AlienwareAW410K();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+private:
+    AlienwareAW410KController*  controller;
+    std::vector<RGBColor>       current_colors;
+};
@@ -1,14 +1,17 @@
-/*-----------------------------------------*\
-|  AlienwareAW510KController.cpp            |
-|                                           |
-|  Driver for Alienware AW510K              |
-|  keyboard light controller                |
-|                                           |
-|  Mohamad Sallal - msallal      05/22/2021 |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| AlienwareAW510KController.cpp                             |
+|                                                           |
+|   Driver for Alienware AW510K keyboard                    |
+|                                                           |
+|   Mohamad Sallal (msallal)                    22 May 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

-#include "AlienwareAW510KController.h"
 #include <cstring>
+#include "AlienwareAW510KController.h"
+#include "StringUtils.h"

 AlienwareAW510KController::AlienwareAW510KController(hid_device* dev_handle, const char* path)
 {
@@ -31,17 +34,19 @@ std::string AlienwareAW510KController::GetDeviceLocation()
 std::string AlienwareAW510KController::GetSerialString()
 {
    wchar_t serial_string[128];
-    hid_get_serial_number_string(dev, serial_string, 128);
+    int ret = hid_get_serial_number_string(dev, serial_string, 128);

-    std::wstring return_wstring = serial_string;
-    std::string return_string(return_wstring.begin(), return_wstring.end());
+    if(ret != 0)
+    {
+        return("");
+    }

-    return(return_string);
+    return(StringUtils::wstring_to_string(serial_string));
 }

 void AlienwareAW510KController::SendCommit()
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -63,7 +68,7 @@ void AlienwareAW510KController::SendCommit()
    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);

    /*-----------------------------------------------------*\
    | Delay 20 milliseconds                                 |
@@ -71,7 +76,6 @@ void AlienwareAW510KController::SendCommit()
    std::this_thread::sleep_for(std::chrono::milliseconds(20));
 }

-
 void AlienwareAW510KController::SendfeatureReport
    (
    unsigned char   first_byte,
@@ -80,7 +84,7 @@ void AlienwareAW510KController::SendfeatureReport
    unsigned char   forth_byte
    )
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -99,7 +103,7 @@ void AlienwareAW510KController::SendfeatureReport
    /*-----------------------------------------------------*\
    | Send Feature report packet                            |
    \*-----------------------------------------------------*/
-    hid_send_feature_report(dev, (unsigned char *)usb_buf, 65);
+    hid_send_feature_report(dev, usb_buf, 65);

    /*-----------------------------------------------------*\
    | Delay 10 milliseconds                                 |
@@ -109,7 +113,7 @@ void AlienwareAW510KController::SendfeatureReport

 void AlienwareAW510KController::SendEdit()
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -127,7 +131,7 @@ void AlienwareAW510KController::SendEdit()
    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);

    /*-----------------------------------------------------*\
    | Delay 2 milliseconds                                  |
@@ -137,7 +141,7 @@ void AlienwareAW510KController::SendEdit()

 void AlienwareAW510KController::SendInitialize()
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -162,7 +166,7 @@ void AlienwareAW510KController::SendInitialize()
    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);

    /*-----------------------------------------------------*\
    | Delay 2 milliseconds                                  |
@@ -216,7 +220,7 @@ void AlienwareAW510KController::SendDirectOn
    std::vector<SelectedKeys>     &frame_data
    )
 {
-    SendfeatureReport(0x0E, frame_data.size(), 0x00, 0x01);
+    SendfeatureReport(0x0E, (unsigned char)frame_data.size(), 0x00, 0x01);

    /*-----------------------------------------------*\
    | To Guarantee the data are always %4 =0 append   |
@@ -296,7 +300,7 @@ void AlienwareAW510KController::SendDirectOn
 void AlienwareAW510KController::SetMode
    (
    unsigned char   mode,
-    unsigned short  speed,
+    unsigned char   speed,
    unsigned char   direction,
    unsigned char   colorMode,
    unsigned char   red,
@@ -318,7 +322,7 @@ void AlienwareAW510KController::UpdateSingleLED
 {
    SendfeatureReport(0x0E, 0x01, 0x00, 0x01);

-    char usb_buf[65];
+    unsigned char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -348,7 +352,7 @@ void AlienwareAW510KController::UpdateSingleLED
    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);

    /*-----------------------------------------------------*\
    | Delay 20 milliseconds                                 |
@@ -360,7 +364,7 @@ void AlienwareAW510KController::SendMode
    (
    unsigned char   /*zone*/,
    unsigned char   mode,
-    unsigned short  speed,
+    unsigned char   speed,
    unsigned char   direction,
    unsigned char   colorMode,
    unsigned char   red,
@@ -368,7 +372,7 @@ void AlienwareAW510KController::SendMode
    unsigned char   blue
    )
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -394,13 +398,13 @@ void AlienwareAW510KController::SendMode
    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);
 }

 void AlienwareAW510KController::SetMorphMode
    (
    unsigned char   mode,
-    unsigned short  speed,
+    unsigned char   speed,
    unsigned char   red1,
    unsigned char   green1,
    unsigned char   blue1,
@@ -409,7 +413,7 @@ void AlienwareAW510KController::SetMorphMode
    unsigned char   blue2
    )
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -438,5 +442,5 @@ void AlienwareAW510KController::SetMorphMode
    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);
 }
@@ -1,19 +1,20 @@
-/*-----------------------------------------*\
-|  AlienwareAW510KController.h              |
-|                                           |
-|  Definitions and types for alienware      |
-|  AW510K Keyboard                          |
-|                                           |
-|  Mohamad Sallal - msallal      05/22/2021 |
-\*-----------------------------------------*/
-
-#include "RGBController.h"
-
-#include <string>
-#include <hidapi/hidapi.h>
+/*---------------------------------------------------------*\
+| AlienwareAW510KController.h                               |
+|                                                           |
+|   Driver for Alienware AW510K keyboard                    |
+|                                                           |
+|   Mohamad Sallal (msallal)                    22 May 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once

+#include <string>
+#include <hidapi.h>
+#include "RGBController.h"
+
 enum
 {
    ALIENWARE_AW510K_ZONE_MODE_KEYBOARD         = 0x01,
@@ -110,7 +111,7 @@ public:
    void        SetMode
                    (
                    unsigned char   mode,
-                    unsigned short  speed,
+                    unsigned char   speed,
                    unsigned char   direction,
                    unsigned char   colorMode,
                    unsigned char   red,
@@ -121,7 +122,7 @@ public:
    void        SetMorphMode
                    (
                    unsigned char   mode,
-                    unsigned short  speed,
+                    unsigned char   speed,
                    unsigned char   red1,
                    unsigned char   green1,
                    unsigned char   blue1,
@@ -146,7 +147,7 @@ private:
                    (
                    unsigned char   zone,
                    unsigned char   mode,
-                    unsigned short  speed,
+                    unsigned char   speed,
                    unsigned char   direction,
                    unsigned char   colorMode,
                    unsigned char   red,
@@ -1,15 +1,17 @@
-/*-----------------------------------------*\
-|  RGBController_AlienwareAW510K.cpp        |
-|                                           |
-|  Generic RGB Interface for alienware      |
-|  AW510K Keyboard                          |
-|                                           |
-|  Mohamad Sallal - msallal      05/22/2021 |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AlienwareAW510K.cpp                         |
+|                                                           |
+|   RGBController for Alienware AW510K keyboard             |
+|                                                           |
+|   Mohamad Sallal (msallal)                    22 May 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

+#include <iterator>
 #include "RGBControllerKeyNames.h"
 #include "RGBController_AlienwareAW510K.h"
-#include <iterator>

 //0xFFFFFFFF indicates an unused entry in matrix
 #define NA  0xFFFFFFFF
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------*\
+| RGBController_AlienwareAW510K.h                           |
+|                                                           |
+|   RGBController for Alienware AW510K keyboard             |
+|                                                           |
+|   Mohamad Sallal (msallal)                    22 May 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "AlienwareAW510KController.h"
+
+class RGBController_AlienwareAW510K : public RGBController
+{
+public:
+    RGBController_AlienwareAW510K(AlienwareAW510KController* controller_ptr);
+    ~RGBController_AlienwareAW510K();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+private:
+    AlienwareAW510KController*  controller;
+    std::vector<RGBColor>       current_colors;
+};
@@ -1,21 +1,30 @@
+/*---------------------------------------------------------*\
+| AlienwareKeyboardControllerDetect.cpp                     |
+|                                                           |
+|   Detector for Alienware Keyboard                         |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include <hidapi.h>
 #include "Detector.h"
 #include "AlienwareAW510KController.h"
 #include "AlienwareAW410KController.h"
 #include "RGBController.h"
 #include "RGBController_AlienwareAW510K.h"
 #include "RGBController_AlienwareAW410K.h"
-#include <hidapi/hidapi.h>

 /*-----------------------------------------------------*\
 | Alienware vendor ID                                   |
 \*-----------------------------------------------------*/
-#define ALIENWARE_VID           0x04F2
+#define ALIENWARE_VID                           0x04F2

 /*-----------------------------------------------------*\
 | Keyboard product IDs                                  |
 \*-----------------------------------------------------*/
-#define ALIENWARE_AW510K_PID    0x1830
-#define ALIENWARE_AW410K_PID    0x1968
+#define ALIENWARE_AW510K_PID                    0x1830
+#define ALIENWARE_AW410K_PID                    0x1968

 /******************************************************************************************\
 *                                                                                          *
@@ -1,36 +0,0 @@
-/*------------------------------------------------------*\
-|  RGBController_AlienwareAW410K.h                       |
-|                                                        |
-|  Generic RGB Interface for Alienware                   |
-|  AW410K keyboard                                       |
-|                                                        |
-|  based on AW510K controller by Mohamad Sallal - msallal|
-|                                                        |
-|  Dominik Mikolajczyk - dmiko 23/10/2023                |
-\*------------------------------------------------------*/
-
-#pragma once
-
-#include "RGBController.h"
-#include "AlienwareAW410KController.h"
-
-class RGBController_AlienwareAW410K : public RGBController
-{
-public:
-    RGBController_AlienwareAW410K(AlienwareAW410KController* controller_ptr);
-    ~RGBController_AlienwareAW410K();
-
-    void        SetupZones();
-
-    void        ResizeZone(int zone, int new_size);
-
-    void        DeviceUpdateLEDs();
-    void        UpdateZoneLEDs(int zone);
-    void        UpdateSingleLED(int led);
-
-    void        DeviceUpdateMode();
-
-private:
-    AlienwareAW410KController*  controller;
-    std::vector<RGBColor>       current_colors;
-};
@@ -1,34 +0,0 @@
-/*-----------------------------------------*\
-|  RGBController_AlienwareAW510K.h          |
-|                                           |
-|  Generic RGB Interface for Alienware      |
-|  AW510K keyboard                          |
-|                                           |
-|  Mohamad Sallal - msallal      05/22/2021 |
-\*-----------------------------------------*/
-
-#pragma once
-
-#include "RGBController.h"
-#include "AlienwareAW510KController.h"
-
-class RGBController_AlienwareAW510K : public RGBController
-{
-public:
-    RGBController_AlienwareAW510K(AlienwareAW510KController* controller_ptr);
-    ~RGBController_AlienwareAW510K();
-
-    void        SetupZones();
-
-    void        ResizeZone(int zone, int new_size);
-    
-    void        DeviceUpdateLEDs();
-    void        UpdateZoneLEDs(int zone);
-    void        UpdateSingleLED(int led);
-
-    void        DeviceUpdateMode();
-
-private:
-    AlienwareAW510KController*  controller;
-    std::vector<RGBColor>       current_colors;
-};
@@ -1,32 +1,36 @@
-/*-----------------------------------------*\
-|  AnnePro2Controller.cpp                   |
-|                                           |
-|  Driver for Obins Lab AnnePro2 keyboard   |
-|                                           |
-|  Sergey Gavrilov (DrZlo13) 06/06/2021     |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| AnnePro2Controller.cpp                                    |
+|                                                           |
+|   Driver for Obins Lab AnnePro2 keyboard                  |
+|                                                           |
+|   Sergey Gavrilov (DrZlo13)                   06 Jun 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include "AnnePro2Controller.h"
+#include "StringUtils.h"

 using namespace std::chrono_literals;

-AnnePro2Controller::AnnePro2Controller(hid_device* dev_handle, const char* path) 
+AnnePro2Controller::AnnePro2Controller(hid_device* dev_handle, const char* path)
 {
    dev         = dev_handle;
    location    = path;
 }

-AnnePro2Controller::~AnnePro2Controller() 
+AnnePro2Controller::~AnnePro2Controller()
 {
    hid_close(dev);
 }

-std::string AnnePro2Controller::GetDeviceLocation() 
+std::string AnnePro2Controller::GetDeviceLocation()
 {
    return("HID: " + location);
 }

-std::string AnnePro2Controller::GetSerialString() 
+std::string AnnePro2Controller::GetSerialString()
 {
    wchar_t serial_string[128];
    int ret = hid_get_serial_number_string(dev, serial_string, 128);
@@ -36,13 +40,10 @@ std::string AnnePro2Controller::GetSerialString()
        return("");
    }

-    std::wstring return_wstring = serial_string;
-    std::string return_string(return_wstring.begin(), return_wstring.end());
-
-    return(return_string);
+    return(StringUtils::wstring_to_string(serial_string));
 }

-void AnnePro2Controller::SendDirect(unsigned char frame_count, unsigned char * frame_data) 
+void AnnePro2Controller::SendDirect(unsigned char frame_count, unsigned char * frame_data)
 {
    /*-------------------------------------------------------------*\
    | Reverse engineered by https://github.com/manualmanul/Annemone |
@@ -74,7 +75,7 @@ void AnnePro2Controller::SendDirect(unsigned char frame_count, unsigned char * f
    {
        const unsigned char e = (messages_to_send_amount << 4) + p;
        const unsigned char a = ((messages_to_send_amount - 1) == p) ? val_2 + real_command_info_length : max_message_length + real_command_info_length;
-        
+
        /*---------------------------------------------------------*\
        | Service data                                              |
        \*---------------------------------------------------------*/
@@ -1,19 +1,20 @@
-/*-----------------------------------------*\
-|  AnnePro2Controller.h                     |
-|                                           |
-|  Driver for Obins Lab AnnePro2 keyboard   |
-|                                           |
-|  Sergey Gavrilov (DrZlo13) 06/06/2021     |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| AnnePro2Controller.h                                      |
+|                                                           |
+|   Driver for Obins Lab AnnePro2 keyboard                  |
+|                                                           |
+|   Sergey Gavrilov (DrZlo13)                   06 Jun 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once
-#include "RGBController.h"

 #include <string>
 #include <vector>
-#include <hidapi/hidapi.h>
-
-#pragma once
+#include <hidapi.h>
+#include "RGBController.h"

 class AnnePro2Controller
 {
@@ -33,4 +34,4 @@ public:
 private:
    hid_device*                 dev;
    std::string                 location;
-};
+};
@@ -1,16 +1,34 @@
+/*---------------------------------------------------------*\
+| AnnePro2ControllerDetect.cpp                              |
+|                                                           |
+|   Detector for Obins Lab AnnePro2 keyboard                |
+|                                                           |
+|   Sergey Gavrilov (DrZlo13)                   06 Jun 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #include "Detector.h"
 #include "AnnePro2Controller.h"
 #include "RGBController.h"
 #include "RGBController_AnnePro2.h"
-#include <hidapi/hidapi.h>
+#include <hidapi.h>

-#define ANNE_PRO_2_VID_1 0x04D9
-#define ANNE_PRO_2_VID_2 0x3311
-#define ANNE_PRO_2_PID_1 0x8008
-#define ANNE_PRO_2_PID_2 0x8009
-#define ANNE_PRO_2_PID_3 0xA292
-#define ANNE_PRO_2_PID_4 0xA293
-#define ANNE_PRO_2_PID_5 0xA297
+/*---------------------------------------------------------*\
+| Anne Pro 2 vendor IDs                                     |
+\*---------------------------------------------------------*/
+#define ANNE_PRO_2_VID_1                            0x04D9
+#define ANNE_PRO_2_VID_2                            0x3311
+
+/*---------------------------------------------------------*\
+| Anne Pro 2 product IDs                                    |
+\*---------------------------------------------------------*/
+#define ANNE_PRO_2_PID_1                            0x8008
+#define ANNE_PRO_2_PID_2                            0x8009
+#define ANNE_PRO_2_PID_3                            0xA292
+#define ANNE_PRO_2_PID_4                            0xA293
+#define ANNE_PRO_2_PID_5                            0xA297

 /******************************************************************************************\
 *                                                                                          *
@@ -1,11 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_AnnePro2.cpp               |
-|                                           |
-|  Generic RGB Interface for Obins Lab      |
-|  AnnePro2 keyboard                        |
-|                                           |
-|  Sergey Gavrilov (DrZlo13) 06/06/2021     |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AnnePro2.cpp                                |
+|                                                           |
+|   RGBController for Obins Lab AnnePro2 keyboard           |
+|                                                           |
+|   Sergey Gavrilov (DrZlo13)                   06 Jun 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include "RGBControllerKeyNames.h"
 #include "RGBController_AnnePro2.h"
@@ -1,13 +1,16 @@
-/*-----------------------------------------*\
-|  RGBController_AnnePro2.h                 |
-|                                           |
-|  Generic RGB Interface for Obins Lab      |
-|  AnnePro2 keyboard                        |
-|                                           |
-|  Sergey Gavrilov (DrZlo13) 06/06/2021     |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AnnePro2.h                                  |
+|                                                           |
+|   RGBController for Obins Lab AnnePro2 keyboard           |
+|                                                           |
+|   Sergey Gavrilov (DrZlo13)                   06 Jun 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once
+
 #include "RGBController.h"
 #include "AnnePro2Controller.h"

@@ -1,13 +1,16 @@
-/*-----------------------------------------*\
-|  ArcticController.h                       |
-|                                           |
-|  Controller Interface for Arctic devices  |
-|                                           |
-|  Armin Wolf (Wer-Wolf) 01/09/2023         |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| ArcticController.cpp                                      |
+|                                                           |
+|   Driver for Arctic devices                               |
+|                                                           |
+|   Armin Wolf (Wer-Wolf)                       09 Jan 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

-#include "ArcticController.h"
 #include <cstring>
+#include "ArcticController.h"

 using namespace std::chrono_literals;

@@ -1,14 +1,17 @@
-/*-----------------------------------------*\
-|  ArcticController.h                       |
-|                                           |
-|  Controller Interface for Arctic devices  |
-|                                           |
-|  Armin Wolf (Wer-Wolf) 01/09/2023         |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| ArcticController.h                                        |
+|                                                           |
+|   Driver for Arctic devices                               |
+|                                                           |
+|   Armin Wolf (Wer-Wolf)                       09 Jan 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once
-#include <algorithm>

+#include <algorithm>
 #include "RGBController.h"
 #include "serial_port.h"

@@ -1,19 +1,22 @@
-/*-----------------------------------------*\
-|  ArcticControllerDetect.cpp               |
-|                                           |
-|  Detect Arctic RGB controllers            |
-|                                           |
-|  Armin Wolf (Wer-Wolf) 01/09/2023         |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| ArcticControllerDetect.cpp                                |
+|                                                           |
+|   Detector for Arctic devices                             |
+|                                                           |
+|   Armin Wolf (Wer-Wolf)                       09 Jan 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

+#include <stdio.h>
+#include <stdlib.h>
+#include <vector>
 #include "Detector.h"
 #include "ArcticController.h"
 #include "RGBController.h"
 #include "RGBController_Arctic.h"
 #include "find_usb_serial_port.h"
-#include <vector>
-#include <stdio.h>
-#include <stdlib.h>

 #define CH341_VID   0x1A86
 #define CH341_PID   0x7523
@@ -44,5 +47,5 @@ REGISTER_DETECTOR("Arctic RGB controller", DetectArcticControllers);
 /*---------------------------------------------------------------------------------------------------------*\
 | Entries for dynamic UDEV rules                                                                            |
 |                                                                                                           |
-| DUMMY_DEVICE_DETECTOR("Arctic RGB controller", DetectArcticControllers, 0x1a86, 0x7523 )                  |
+| DUMMY_DEVICE_DETECTOR("Arctic RGB controller", DetectArcticControllers, 0x1A86, 0x7523 )                  |
 \*---------------------------------------------------------------------------------------------------------*/
@@ -1,13 +1,16 @@
-/*-----------------------------------------*\
-|  RGBController_Arctic.h                   |
-|                                           |
-|  Generic RGB Interface for Arctic devices |
-|                                           |
-|  Armin Wolf (Wer-Wolf) 01/09/2023         |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_Arctic.cpp                                  |
+|                                                           |
+|   RGBController for Arctic devices                        |
+|                                                           |
+|   Armin Wolf (Wer-Wolf)                       09 Jan 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

-#include "RGBController_Arctic.h"
 #include <math.h>
+#include "RGBController_Arctic.h"

 using namespace std::chrono_literals;

@@ -1,17 +1,21 @@
-/*-----------------------------------------*\
-|  RGBController_Arctic.h                   |
-|                                           |
-|  Generic RGB Interface for Arctic devices |
-|                                           |
-|  Armin Wolf (Wer-Wolf) 27/08/2023         |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_Arctic.h                                    |
+|                                                           |
+|   RGBController for Arctic devices                        |
+|                                                           |
+|   Armin Wolf (Wer-Wolf)                       09 Jan 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once
+
+#include <chrono>
+#include <thread>
 #include "ArcticController.h"
 #include "RGBController.h"
 #include "serial_port.h"
-#include <chrono>
-#include <thread>

 class RGBController_Arctic : public RGBController
 {
@@ -1,14 +1,17 @@
-/*-----------------------------------------*\
-|  AsusAuraCoreController.cpp               | 
-|                                           |
-|  Driver for ASUS ROG Aura Core RGB        |
-|  lighting controller                      |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 4/13/2020   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| AsusAuraCoreController.cpp                                |
+|                                                           |
+|   Driver for ASUS ROG Aura Core                           |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                13 Apr 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

-#include "AsusAuraCoreController.h"
 #include <cstring>
+#include "AsusAuraCoreController.h"
+#include "StringUtils.h"

 #define AURA_CORE_MAX_MESSAGE_SIZE  64

@@ -47,10 +50,7 @@ std::string AuraCoreController::GetSerialString()
        return("");
    }

-    std::wstring return_wstring = serial_string;
-    std::string return_string(return_wstring.begin(), return_wstring.end());
-
-    return(return_string);
+    return(StringUtils::wstring_to_string(serial_string));
 }

 void AuraCoreController::SendBrightness
@@ -1,19 +1,20 @@
-/*-----------------------------------------*\
-|  AsusAuraCoreController.h                 |
-|                                           |
-|  Definitions and types for ASUS ROG Aura  |
-|  Core RGB lighting controller             |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 4/13/2020   |
-\*-----------------------------------------*/
-
-#include "RGBController.h"
-
-#include <string>
-#include <hidapi/hidapi.h>
+/*---------------------------------------------------------*\
+| AsusAuraCoreController.h                                  |
+|                                                           |
+|   Driver for ASUS ROG Aura Core                           |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                13 Apr 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #pragma once

+#include <string>
+#include <hidapi.h>
+#include "RGBController.h"
+
 enum AuraCoreDeviceType
 {
    AURA_CORE_DEVICE_UNKNOWN            = 0,
@@ -119,5 +120,4 @@ private:
    void    Handshake();
    void    SendIdString();
    void    SendQuery();
-
 };
@@ -1,10 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_AsusAuraCore.cpp           |
-|                                           |
-|  Generic RGB Interface for ROG Aura Core  |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 4/17/2020   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AsusAuraCore.cpp                            |
+|                                                           |
+|   RGBController for ASUS ROG Aura Core                    |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                13 Apr 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include "RGBController_AsusAuraCore.h"

@@ -0,0 +1,37 @@
+/*---------------------------------------------------------*\
+| RGBController_AsusAuraCore.h                              |
+|                                                           |
+|   RGBController for ASUS ROG Aura Core                    |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                13 Apr 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "AsusAuraCoreController.h"
+
+class RGBController_AuraCore : public RGBController
+{
+public:
+    RGBController_AuraCore(AuraCoreController* controller_ptr);
+    ~RGBController_AuraCore();
+
+    void        SetupKeyboard();
+    void        SetupGA15DH();
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+private:
+    AuraCoreController* controller;
+};
@@ -1,14 +1,24 @@
+/*---------------------------------------------------------*\
+| AsusAuraCoreControllerDetect.cpp                          |
+|                                                           |
+|   Detector for ASUS ROG Aura Core                         |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                13 Apr 2020 |
+|   Chris M (Dr_No)                             28 Jul 2022 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #include "Detector.h"
 #include "AsusAuraCoreController.h"
 #include "RGBController.h"
 #include "RGBController_AsusAuraCore.h"
 #include "RGBController_AsusAuraCoreLaptop.h"
-#include <hidapi/hidapi.h>
+#include <hidapi.h>

 #define AURA_CORE_VID                   0x0B05

-#define AURA_STRIX_SCAR_15_PID          0x19B6
-
 /******************************************************************************************\
 *                                                                                          *
 *   DetectAuraCoreControllers                                                              *
@@ -1,51 +1,18 @@
-/*---------------------------------------------------------------------*\
-|  AsusAuraCoreLaptopController.cpp                                     |
-|                                                                       |
-|  Driver for Asus Aura Core Laptop USB Controller                      |
-|                                                                       |
-|  Chris M (Dr_No)          28 Jul 2022                                 |
-|                                                                       |
-\*---------------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| AsusAuraCoreLaptopController.cpp                          |
+|                                                           |
+|   Driver for ASUS ROG Aura Core Laptop                    |
+|                                                           |
+|   Chris M (Dr_No)                             28 Jul 2022 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/

 #include "AsusAuraCoreLaptopController.h"
-
+#include "dmiinfo.h"
 #include "SettingsManager.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,
-
-};
+#include "StringUtils.h"

 static std::string power_zones[ASUSAURACORELAPTOP_POWER_ZONES] =
 {
@@ -65,20 +32,40 @@ static std::string power_states[ASUSAURACORELAPTOP_POWER_STATES] =

 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;

-    dev                 = dev_handle;
-    location            = path;
+    /*---------------------------------------------------------*\
+    | The motherboard name will uniquely ID the laptop to       |
+    |   determine the metadata of the device.                   |
+    \*---------------------------------------------------------*/
+    DMIInfo dmi_info;
+    std::string dmi_name    = dmi_info.getMainboard();
+    bool not_found          = true;

-    hid_get_manufacturer_string(dev, tmp, sz);
-    std::wstring wName = std::wstring(tmp);
-    device_name = std::string(wName.begin(), wName.end());
+    for(uint16_t i = 0; i < AURA_CORE_LAPTOP_DEVICE_COUNT; i++)
+    {
+        if(aura_core_laptop_device_list[i]->dmi_name == dmi_name)
+        {
+            /*---------------------------------------------------------*\
+            | Set device ID                                             |
+            \*---------------------------------------------------------*/
+            not_found       = false;
+            device_index    = i;
+            break;
+        }
+    }

-    hid_get_product_string(dev, tmp, sz);
-    wName = std::wstring(tmp);
-    device_name.append(" ").append(std::string(wName.begin(), wName.end()));
+    if(not_found)
+    {
+        LOG_ERROR("[%s] device capabilities not found. Please creata a new device request.",
+                  dmi_name.c_str());
+        return;
+    }

+    /*---------------------------------------------------------*\
+    | Only set power config for known devices                   |
+    \*---------------------------------------------------------*/
    SetPowerConfigFromJSON();
 }

@@ -87,28 +74,81 @@ AsusAuraCoreLaptopController::~AsusAuraCoreLaptopController()
    hid_close(dev);
 }

-std::string AsusAuraCoreLaptopController::GetDeviceName()
+const aura_core_laptop_device* AsusAuraCoreLaptopController::GetDeviceData()
 {
-    return device_name;
+    return aura_core_laptop_device_list[device_index];
+}
+
+std::string AsusAuraCoreLaptopController::GetDeviceDescription()
+{
+    /*---------------------------------------------------------*\
+    | Get device name from HID manufacturer and product strings |
+    \*---------------------------------------------------------*/
+    wchar_t name_string[HID_MAX_STR];
+
+    hid_get_manufacturer_string(dev, name_string, HID_MAX_STR);
+    std::string name = StringUtils::wstring_to_string(name_string);
+
+    hid_get_product_string(dev, name_string, HID_MAX_STR);
+    name.append(" ").append(StringUtils::wstring_to_string(name_string));
+    return name;
+}
+
+unsigned int AsusAuraCoreLaptopController::GetKeyboardLayout()
+{
+    const uint8_t index                                     = 6;
+    uint8_t result                                          = 0;
+    uint8_t rd_buf[ASUSAURACORELAPTOP_WRITE_PACKET_SIZE]    = { ASUSAURACORELAPTOP_REPORT_ID };
+    uint8_t buffer[ASUSAURACORELAPTOP_WRITE_PACKET_SIZE]    = { ASUSAURACORELAPTOP_REPORT_ID,
+                                                                ASUSAURACORELAPTOP_CMD_LAYOUT,
+                                                                0x20,
+                                                                0x31,
+                                                                0x00,
+                                                                0x10  };
+
+    /*---------------------------------------------------------*\
+    | Clear the read buffer to ensure we read the right packet  |
+    \*---------------------------------------------------------*/
+    do
+    {
+        result = hid_read_timeout(dev, rd_buf, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE, 10);
+    }
+    while(result > 0);
+
+    memset(&rd_buf[1],     0, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE - 1);
+    memset(&buffer[index], 0, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE - index);
+
+    hid_send_feature_report(dev, buffer, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE);
+    result = hid_get_feature_report(dev, rd_buf, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE);
+
+    LOG_DEBUG("[%s] GetKeyboardLayout %02X %02X %02X %02X   %02X %02X %02X {%02X}   %02X %02X %02X %02X",
+              aura_core_laptop_device_list[device_index]->dmi_name.c_str(),
+              rd_buf[5],  rd_buf[6],  rd_buf[7],  rd_buf[8],  rd_buf[9],  rd_buf[10],
+              rd_buf[11], rd_buf[12], rd_buf[13], rd_buf[14], rd_buf[15], rd_buf[16]);
+
+    if(result > 0)
+    {
+        return rd_buf[12];
+    }
+
+    LOG_DEBUG("[%s] GetKeyboardLayout: An error occurred! Setting layout to ANSI",
+              aura_core_laptop_device_list[device_index]->dmi_name.c_str());
+    return ASUSAURACORELAPTOP_LAYOUT_ANSI;
 }

 std::string AsusAuraCoreLaptopController::GetSerial()
 {
-    const uint8_t sz    = HID_MAX_STR;
-    wchar_t       tmp[sz];
+    wchar_t serial_string[128];
+    int ret = hid_get_serial_number_string(dev, serial_string, 128);

-    int ret             = hid_get_serial_number_string(dev, tmp, sz);
-
-    if (ret != 0)
+    if(ret != 0)
    {
-        LOG_DEBUG("[%s] Get HID Serial string failed", device_name.c_str());
+        LOG_DEBUG("[%s] Get HID Serial string failed",
+                  aura_core_laptop_device_list[device_index]->dmi_name.c_str());
        return("");
    }

-    std::wstring w_tmp  = std::wstring(tmp);
-    std::string serial  = std::string(w_tmp.begin(), w_tmp.end());
-
-    return serial;
+    return(StringUtils::wstring_to_string(serial_string));
 }

 std::string AsusAuraCoreLaptopController::GetLocation()
@@ -136,49 +176,73 @@ void AsusAuraCoreLaptopController::SetMode(uint8_t mode, uint8_t speed, uint8_t
        current_random      = random;
        current_direction   = direction;

+        if(current_mode == ASUSAURACORELAPTOP_MODE_DIRECT)
+        {
+            SendInitDirectMode();
+            return;
+        }
+
        SendUpdate();
        SendBrightness();
    }
 }

-void AsusAuraCoreLaptopController::SetLedsDirect(std::vector<RGBColor> colors)
+void AsusAuraCoreLaptopController::SendInitDirectMode()
+{
+    uint8_t buffer[ASUSAURACORELAPTOP_WRITE_PACKET_SIZE]    = { ASUSAURACORELAPTOP_REPORT_ID, ASUSAURACORELAPTOP_CMD_DIRECT };
+    memset(&buffer[2], 0, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE - 2);
+
+    LOG_DEBUG("[%s] Resetting device for direct control", aura_core_laptop_device_list[device_index]->dmi_name.c_str());
+    hid_send_feature_report(dev, buffer, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE);
+}
+
+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;
+    const uint8_t   key_set                                 = 167;
+    const uint8_t   led_count                               = colors.size();
+    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];
+    uint8_t*        key_buf                                 = new uint8_t[map_size];

    memset(key_buf, 0, map_size);

-    for(size_t led_index = 0; led_index < colors.size(); led_index++)
+    for(size_t led_index = 0; led_index < led_count; led_index++)
    {
-        uint16_t offset         = 3 * packet_map[led_index];
+        std::size_t buf_idx     = (led_index * 3);

-        key_buf[offset]         = RGBGetRValue(colors[led_index]);
-        key_buf[offset + 1]     = RGBGetGValue(colors[led_index]);
-        key_buf[offset + 2]     = RGBGetBValue(colors[led_index]);
+        key_buf[buf_idx]        = RGBGetRValue(*colors[led_index]);
+        key_buf[buf_idx + 1]    = RGBGetGValue(*colors[led_index]);
+        key_buf[buf_idx + 2]    = RGBGetBValue(*colors[led_index]);
    }

    for(size_t i = 0; i < key_set; i+=leds_per_packet)
    {
-        uint8_t leds_remaining  = key_set - i;
+        uint8_t leds_remaining  = key_set - (uint8_t)i;

        if(leds_remaining < leds_per_packet)
        {
            buffer[07]          = leds_remaining;
+
+            memset(&buffer[ASUSAURACORELAPTOP_DATA_BYTE],
+                   0,
+                   ASUSAURACORELAPTOP_WRITE_PACKET_SIZE - ASUSAURACORELAPTOP_DATA_BYTE);
        }

-        buffer[06]              = i;
+        buffer[06]              = (uint8_t)i;
        memcpy(&buffer[ASUSAURACORELAPTOP_DATA_BYTE], &key_buf[3 * i], (3 * buffer[07]));

+        LOG_DEBUG("[%s] Sending buffer @ index %d thru index %d",
+                  aura_core_laptop_device_list[device_index]->dmi_name.c_str(),
+                  i,
+                  i + buffer[07]);
+
        hid_send_feature_report(dev, buffer, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE);
    }

@@ -186,15 +250,31 @@ void AsusAuraCoreLaptopController::SetLedsDirect(std::vector<RGBColor> colors)
    buffer[5] = 0x00;
    buffer[6] = 0x00;
    buffer[7] = 0x00;
-    memcpy(&buffer[ASUSAURACORELAPTOP_DATA_BYTE], &key_buf[3 * key_set], (3 * (led_count - key_set)));
+
+    memset(&buffer[ASUSAURACORELAPTOP_DATA_BYTE],
+           0,
+           ASUSAURACORELAPTOP_WRITE_PACKET_SIZE - ASUSAURACORELAPTOP_DATA_BYTE);
+
+    if(led_count > key_set)
+    {
+        memcpy(&buffer[ASUSAURACORELAPTOP_DATA_BYTE],
+               &key_buf[3 * key_set],
+               (3 * (led_count - key_set)));
+    }
+
+    LOG_DEBUG("[%s] Sending buffer @ index %d thru index %d",
+              aura_core_laptop_device_list[device_index]->dmi_name.c_str(),
+              key_set,
+              led_count);

    hid_send_feature_report(dev, buffer, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE);
+    delete[] key_buf;
 }

 void AsusAuraCoreLaptopController::SendBrightness()
 {
-    const uint8_t index                                     = 2;
-    uint8_t buffer[ASUSAURACORELAPTOP_WRITE_PACKET_SIZE]    = { ASUSAURACORELAPTOP_REPORT_ID, ASUSAURACORELAPTOP_CMD_BRIGHTNESS };
+    const uint8_t index                                     = 5;
+    uint8_t buffer[ASUSAURACORELAPTOP_WRITE_PACKET_SIZE]    = { ASUSAURACORELAPTOP_REPORT_ID, ASUSAURACORELAPTOP_CMD_BRIGHTNESS, 0xC5, 0xC4};

    memset(&buffer[index], 0, ASUSAURACORELAPTOP_WRITE_PACKET_SIZE - index);
    buffer[4] = current_brightness;
@@ -287,6 +367,8 @@ void AsusAuraCoreLaptopController::SetPowerConfigFromJSON()
        device_settings[section_power]  = pcfg;
        settings_manager->SetSettings(detector_name, device_settings);
        settings_manager->SaveSettings();
+        LOG_DEBUG("[%s] default power config saved to openrgb.json",
+                  aura_core_laptop_device_list[device_index]->dmi_name.c_str());
    }
    else
    {
@@ -297,7 +379,9 @@ void AsusAuraCoreLaptopController::SetPowerConfigFromJSON()
            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"));
+                LOG_DEBUG("[%s] Reading power config for %s: %s",
+                          aura_core_laptop_device_list[device_index]->dmi_name.c_str(),
+                          key_name.c_str(), ((power_config[i].state) ? "On" : "Off"));
            }
        }
    }
@@ -307,7 +391,7 @@ void AsusAuraCoreLaptopController::SetPowerConfigFromJSON()
    |   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[] =
+    bool flag_array[32] =
    {
        power_config[0].state,      power_config[4].state,
        power_config[1].state,      power_config[5].state,
@@ -324,7 +408,9 @@ void AsusAuraCoreLaptopController::SetPowerConfigFromJSON()
    };

    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);
+    LOG_DEBUG("[%s] Sending power config Logo+KB: %02X Lightbar: %02X Lid Edges: %02X Raw: %08X",
+              aura_core_laptop_device_list[device_index]->dmi_name.c_str(),
+              (flags & 0xFF), ((flags >> 8)  & 0xFF), ((flags >> 16)  & 0xFF), flags);
    SendPowerConfig(flags);
 }

@@ -1,21 +1,24 @@
-/*---------------------------------------------------------------------*\
-|  AsusAuraCoreLaptopController.h                                       |
-|                                                                       |
-|  Driver for AsusAuraCoreLaptop USB Controller                         |
-|                                                                       |
-|  Chris M (Dr_No)          28 Jul 2022                                 |
-|                                                                       |
-\*---------------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| AsusAuraCoreLaptopController.h                            |
+|                                                           |
+|   Driver for ASUS ROG Aura Core Laptop                    |
+|                                                           |
+|   Chris M (Dr_No)                             28 Jul 2022 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once

 #include <string>
 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "LogManager.h"
 #include "RGBController.h"
 #include "ResourceManager.h"
 #include "RGBControllerKeyNames.h"
-
-#pragma once
+#include "AsusAuraCoreLaptopDevices.h"

 #define NA                                      0xFFFFFFFF
 #define HID_MAX_STR                             255
@@ -31,7 +34,7 @@
 #define ASUSAURACORELAPTOP_POWER_ZONES          4
 #define ASUSAURACORELAPTOP_POWER_STATES         4
 #define ASUSAURACORELAPTOP_BRIGHTNESS_MIN       0
-#define ASUSAURACORELAPTOP_BRIGHTNESS_MAX       255
+#define ASUSAURACORELAPTOP_BRIGHTNESS_MAX       3 // No device has proven to have 256 keyboard brightness levels, only 0..3

 enum
 {
@@ -81,6 +84,7 @@ enum
    ASUSAURACORELAPTOP_CMD_UPDATE               = 0xB3,
    ASUSAURACORELAPTOP_CMD_APPLY                = 0xB4,
    ASUSAURACORELAPTOP_CMD_SET                  = 0xB5,
+    ASUSAURACORELAPTOP_CMD_LAYOUT               = 0x05,
 };

 enum
@@ -90,6 +94,12 @@ enum
    ASUSAURACORELAPTOP_SPEED_FASTEST            = 0xF5, // Fastest speed
 };

+enum aura_core_laptop_layout
+{
+    ASUSAURACORELAPTOP_LAYOUT_ANSI              = 0x01,     /* US ANSI Layout                   */
+    ASUSAURACORELAPTOP_LAYOUT_ISO               = 0x02,     /* EURO ISO Layout                  */
+};
+
 struct p_state
 {
    std::string zone;
@@ -102,33 +112,36 @@ public:
    AsusAuraCoreLaptopController(hid_device* dev_handle, const char* path);
    ~AsusAuraCoreLaptopController();

-    std::string             GetDeviceName();
-    std::string             GetSerial();
-    std::string             GetLocation();
+    const aura_core_laptop_device*  GetDeviceData();
+    std::string                     GetDeviceDescription();
+    std::string                     GetSerial();
+    unsigned int                    GetKeyboardLayout();
+    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);
+    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);
+    void                            SendInitDirectMode();
 private:
-    std::string             device_name;
-    std::string             location;
-    hid_device*             dev;
+    hid_device*                     dev;
+    uint16_t                        device_index;
+    std::string                     location;

-    uint8_t                 current_mode;
-    uint8_t                 current_speed;
-    uint8_t                 current_direction;
+    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;
+    RGBColor                        current_c1;
+    RGBColor                        current_c2;
+    uint8_t                         current_brightness;
+    uint8_t                         current_random;

-    void                    SendApply();
-    void                    SendBrightness();
-    void                    SendSet();
-    void                    SendUpdate();
+    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();
+    void                            SetPowerConfigFromJSON();
+    void                            SendPowerConfig(uint32_t flags);
+    uint32_t                        PackPowerFlags(bool flags[]);
+    std::vector<p_state>            PowerConfigArray();
 };
@@ -0,0 +1,347 @@
+#include "AsusAuraCoreLaptopDevices.h"
+
+/*-------------------------------------------------------------------------*\
+|  Aura Core Key Values                                                     |
+|    NULL values are keys that are handed to the KLM but are removed as     |
+|    a part of customisation. They are included to maintain expected key    |
+|    count is aligned to the value count.                                   |
+\*-------------------------------------------------------------------------*/
+
+std::vector<unsigned int> aura_core_laptop_15_values =
+{
+    /* ESC          F1    F2    F3    F4    F5    F6    F7    F8    F9   F10   F11   F12         DEL  */
+        21,         23,   24,   25,   26,   28,   29,   30,   31,   33,   34,   35,   36,
+    /* BKTK    1     2     3     4     5     6     7     8     9     0     -     =   BSPC        PLAY  */
+        42,   43,   44,   45,   46,   47,   48,   49,   50,   51,   52,   53,   54,   55,
+    /* TAB     Q     W     E     R     T     Y     U     I     O     P     [     ]     \         STOP  */
+        63,   64,   65,   66,   67,   68,   69,   70,   71,   72,   73,   74,   75,   76,
+    /* CPLK    A     S     D     F     G     H     J     K     L     ;     "     #   ENTR        PREV  */
+        84,   85,   86,   87,   88,   89,   90,   91,   92,   93,   94,   95,   96,   98,
+    /* LSFT  ISO\    Z     X     C     V     B     N     M     ,     .     /   RSFT        ARWU  NEXT  */
+       105,  106,  107,  108,  109,  110,  111,  112,  113,  114,  115,  116,  119,
+    /* LCTL  LWIN  LALT              SPC               RALT  RFNC  RMNU  RCTL        ARWL  ARWD  ARWR  */
+       126,  128,  129,              131,              135,  136,  136,  137,
+};
+
+std::vector<unsigned int> aura_core_laptop_17_values =
+{
+    /* ESC          F1    F2    F3    F4    F5    F6    F7    F8    F9   F10   F11   F12   NULL  NULL  PAUS                          */
+        21,         23,   24,   25,   26,   28,   29,   30,   31,   33,   34,   35,   36,    0,    0,   39,
+    /* BKTK    1     2     3     4     5     6     7     8     9     0     -     =   BSPC  NULL  NULL  NULL  NMLK  NMDV  NMTM  NMMI  */
+        42,   43,   44,   45,   46,   47,   48,   49,   50,   51,   52,   53,   54,   56,    0,    0,    0,   59,   60,   61,   62,
+    /* TAB     Q     W     E     R     T     Y     U     I     O     P     [     ]     \   NULL  NULL  NULL  NM7   NM8   NM9   NMPL  */
+        63,   64,   65,   66,   67,   68,   69,   70,   71,   72,   73,   74,   75,   76,    0,    0,    0,   80,   81,   82,   83,
+    /* CPLK    A     S     D     F     G     H     J     K     L     ;     "     #   ENTR                    NM4   NM5   NM6         */
+        84,   85,   86,   87,   88,   89,   90,   91,   92,   93,   94,   95,   96,   98,                    101,  102,  103,
+    /* LSFT  ISO\    Z     X     C     V     B     N     M     ,     .     /   RSFT              ARWU        NM1   NM2   NM3   NMER  */
+       105,  106,  107,  108,  109,  110,  111,  112,  113,  114,  115,  116,  119,              139,        122,  123,  124,  125,
+    /* LCTL  LWIN  LALT              SPC               RALT  RFNC  RMNU  RCTL              ARWL  ARWD  ARWR        NM0   NMPD        */
+       126,  128,  129,              131,              135,  136,  136,  137,              159,  160,  161,        144,  145,
+};
+
+std::vector<unsigned int> aura_core_laptop_18_values =
+{
+    /* ESC          F1    F2    F3    F4    F5    F6    F7    F8    F9   F10   F11   F12   NULL  NULL  PAUS                          */
+        21,         23,   24,   25,   26,   28,   29,   30,   31,   33,   34,   35,   36,    0,    0,   39,
+    /* BKTK    1     2     3     4     5     6     7     8     9     0     -     =   BSPC  NULL  NULL  NULL  NMLK  NMDV  NMTM  NMMI  */
+        42,   43,   44,   45,   46,   47,   48,   49,   50,   51,   52,   53,   54,   56,    0,    0,    0,   59,   60,   61,   62,
+    /* TAB     Q     W     E     R     T     Y     U     I     O     P     [     ]     \   NULL  NULL  NULL  NM7   NM8   NM9   NMPL  */
+        63,   64,   65,   66,   67,   68,   69,   70,   71,   72,   73,   74,   75,   76,    0,    0,    0,   80,   81,   82,   83,
+    /* CPLK    A     S     D     F     G     H     J     K     L     ;     "     #   ENTR                    NM4   NM5   NM6         */
+        84,   85,   86,   87,   88,   89,   90,   91,   92,   93,   94,   95,   96,   98,                    101,  102,  103,
+    /* LSFT  ISO\    Z     X     C     V     B     N     M     ,     .     /   RSFT              ARWU        NM1   NM2   NM3   NMER  */
+        105,  106,  107,  108,  109,  110,  111,  112,  113,  114,  115,  116,  119,              121,        122,  123,  124,  125,
+    /* LCTL  LWIN  LALT              SPC               RALT  RFNC  RMNU  RCTL              ARWL  ARWD  ARWR        NM0   NMPD        */
+        126,  128,  129,              131,              135,  136,  136,  137,              141,  142,  143,        144,  145,
+};
+
+/*-------------------------------------------------------------------------*\
+|  KEYMAPS                                                                  |
+\*-------------------------------------------------------------------------*/
+keyboard_keymap_overlay_values g533zm_layout
+{
+    KEYBOARD_SIZE_SEVENTY_FIVE,
+    {
+        aura_core_laptop_15_values,
+        {
+            /* Add more regional layout fixes here */
+        }
+    },
+    {
+        /*---------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                 |
+        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
+        \*---------------------------------------------------------------------------------------------------------*/
+        {   0,      0,      15,          37,        KEY_EN_DELETE,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Delete
+        {   0,      1,      15,          58,        KEY_EN_MEDIA_PLAY_PAUSE,    KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Play / Pause
+        {   0,      2,      15,          79,        KEY_EN_MEDIA_STOP,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Play / Pause
+        {   0,      3,      15,         100,        KEY_EN_MEDIA_PREVIOUS,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Play / Pause
+        {   0,      4,      13,         139,        KEY_EN_UP_ARROW,            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Up Arrow
+        {   0,      4,      15,         121,        KEY_EN_MEDIA_NEXT,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Play / Pause
+        {   0,      5,      12,         159,        KEY_EN_LEFT_ARROW,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Left Arrow
+        {   0,      5,      13,         160,        KEY_EN_DOWN_ARROW,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Down Arrow
+        {   0,      5,      14,         161,        KEY_EN_RIGHT_ARROW,         KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Right Arrow
+    }
+};
+
+keyboard_keymap_overlay_values g713rw_keyboard_layout
+{
+    KEYBOARD_SIZE_FULL,
+    {
+        aura_core_laptop_17_values,
+        {
+            /* Add more regional layout fixes here */
+        }
+    },
+    {
+        /*---------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                 |
+        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
+        \*---------------------------------------------------------------------------------------------------------*/
+        {   0,      0,       2,           2,        KEY_EN_MEDIA_VOLUME_DOWN,   KEYBOARD_OPCODE_INSERT_ROW,         },  // Insert Row and add Volume Down
+        {   0,      0,       3,           3,        KEY_EN_MEDIA_VOLUME_UP,     KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Volume Up
+        {   0,      0,       4,           4,        KEY_EN_MEDIA_MUTE,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Mute
+        {   0,      0,       5,           5,        "Key: Fan",                 KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert "Fan" key
+        {   0,      0,       6,           6,        "Key: ROG",                 KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert "ROG" key
+        {   0,      6,       1,         127,        KEY_EN_LEFT_FUNCTION,       KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Left Fuction
+        {   0,      6,       8,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove part of Spacebar
+        {   0,      6,       8,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove part of Spacebar
+        {   0,      6,      10,         136,        KEY_EN_RIGHT_FUNCTION,      KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove Right Fuction
+        {   0,      6,      10,         136,        KEY_EN_RIGHT_WINDOWS,       KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove Right Win Key
+
+        {   0,      1,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
+        {   0,      1,      15,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // trim extra column before numpad
+        {   0,      1,      15,          38,        KEY_EN_DELETE,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert a Delete key
+        {   0,      1,      17,          40,        KEY_EN_PRINT_SCREEN,        KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert a Print Screen key
+        {   0,      1,      18,          41,        KEY_EN_HOME,                KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert a Home key
+        {   0,      2,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      2,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      3,      13,          76,        KEY_EN_ANSI_BACK_SLASH,     KEYBOARD_OPCODE_SWAP_ONLY,          }, // Force ANSI | even on ISO layouts
+        {   0,      3,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      3,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      4,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      4,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      5,      12,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // gap before arrow up key
+        {   0,      5,      13,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // trim extra column before numpad
+
+        {   0,      6,      11,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // 1 empty key before arrow keys
+        {   0,      6,      15,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // trim extra column before numpad
+        {   0,      6,      16,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // 1 empty key between numpad 0 and .
+
+        // Close numpad gap completely
+        {   0,      1,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      2,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      3,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      4,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      5,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      6,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+
+        // Move Arrow keys
+        {   0,      5,      13,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },  // Remove Arrow Up
+        {   0,      6,      13,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },  // Remove Arrow Down
+        {   0,      6,      12,         139,        KEY_EN_UP_ARROW,            KEYBOARD_OPCODE_SWAP_ONLY,          },  // Shift Arrow Up
+        {   0,      7,      11,         159,        KEY_EN_LEFT_ARROW,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      7,      12,         160,        KEY_EN_DOWN_ARROW,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      7,      13,         161,        KEY_EN_RIGHT_ARROW,         KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+    }
+};
+
+keyboard_keymap_overlay_values g713rw_lightbar_layout
+{
+    KEYBOARD_SIZE_EMPTY,
+    {
+        {   /* Values not set in empty keyboard */   },
+        {
+            /* Add more regional layout fixes here */
+        }
+    },
+    {
+        /*---------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                 |
+        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
+        \*---------------------------------------------------------------------------------------------------------*/
+        {   0,      0,       0,         174,        "Lightbar L1",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L1
+        {   0,      0,       1,         173,        "Lightbar L2",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L2
+        {   0,      0,       2,         172,        "Lightbar L3",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L3
+        {   0,      0,       3,         171,        "Lightbar R3",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar R3
+        {   0,      0,       4,         170,        "Lightbar R2",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar R2
+        {   0,      0,       5,         169,        "Lightbar R1",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar R1
+    }
+};
+
+keyboard_keymap_overlay_values g814jv_keyboard_layout
+{
+    KEYBOARD_SIZE_FULL,
+    {
+        aura_core_laptop_18_values,
+        {
+            /* Add more regional layout fixes here */
+        }
+    },
+    {
+     /*---------------------------------------------------------------------------------------------------------*\
+    | Edit Keys                                                                                                 |
+    |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
+    \*---------------------------------------------------------------------------------------------------------*/
+     {   0,      0,       2,           2,        KEY_EN_MEDIA_VOLUME_DOWN,   KEYBOARD_OPCODE_INSERT_ROW,         },  // Insert Row and add Volume Down
+     {   0,      0,       3,           3,        KEY_EN_MEDIA_VOLUME_UP,     KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Volume Up
+     {   0,      0,       4,           4,        KEY_EN_MEDIA_MUTE,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Mute
+     {   0,      0,       5,           5,        "Key: Fan",                 KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert "Fan" key
+     {   0,      0,       6,           6,        "Key: ROG",                 KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert "ROG" key
+     {   0,      6,       8,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove part of Spacebar
+     {   0,      6,       8,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove part of Spacebar
+     {   0,      6,       1,         127,        KEY_EN_LEFT_FUNCTION,       KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Left Fuction
+     {   0,      6,      11,         136,        KEY_EN_PRINT_SCREEN,        KEYBOARD_OPCODE_SWAP_ONLY,          },  // Replace Right Fuction with PrtSc
+     {   0,      6,      12,         136,        KEY_EN_RIGHT_WINDOWS,       KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove Right Win Key
+     {   0,      1,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      1,      14,          38,        KEY_EN_DELETE,              KEYBOARD_OPCODE_SWAP_ONLY,          },  // Insert a Delete key
+     {   0,      1,      16,          40,        KEY_EN_PRINT_SCREEN,        KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert a Print Screen key
+     {   0,      1,      17,          41,        KEY_EN_HOME,                KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert a Home key
+     {   0,      2,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      2,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      2,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      3,      13,          76,        KEY_EN_ANSI_BACK_SLASH,     KEYBOARD_OPCODE_SWAP_ONLY,          }, // Force ANSI | even on ISO layouts
+     {   0,      3,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      3,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  }, // Numpad gap
+     {   0,      3,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      4,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      4,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      4,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      5,      12,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      5,      13,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      5,      14,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      6,      15,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     }
+};
+
+keyboard_keymap_overlay_values g814jv_lightbar_layout
+{
+    KEYBOARD_SIZE_EMPTY,
+    {
+        {   /* Values not set in empty keyboard */   },
+        {
+            /* Add more regional layout fixes here */
+        }
+    },
+    {
+        /*---------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                 |
+        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
+        \*---------------------------------------------------------------------------------------------------------*/
+        {   0,      0,       0,         173,        "Lightbar L1",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L1
+        {   0,      0,       1,         172,        "Lightbar L2",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L2
+        {   0,      0,       2,         170,        "Lightbar R2",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar R2
+        {   0,      0,       3,         169,        "Lightbar R1",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar R2
+    }
+};
+
+
+/*-------------------------------------------------------------------------*\
+|  AURA CORE LAPTOP DEVICES                                                 |
+\*-------------------------------------------------------------------------*/
+
+/*-------------------------------------------------------------*\
+|  ASUS ROG Strix SCAR 15                                       |
+|                                                               |
+|  Zone "Keyboard"                                              |
+|       Matrix                                                  |
+|       7 Rows, 16 Columns                                      |
+\*-------------------------------------------------------------*/
+static const aura_core_laptop_zone g533zm_zone =
+{
+    ZONE_EN_KEYBOARD,
+    &g533zm_layout
+};
+
+static const aura_core_laptop_device g533zm_device =
+{
+    "G533ZM",
+    {
+        &g533zm_zone,
+        nullptr,
+        nullptr,
+        nullptr,
+        nullptr,
+        nullptr
+    }
+};
+
+/*-------------------------------------------------------------*\
+|  ASUS ROG Strix SCAR G713RW                                   |
+|                                                               |
+|  Zone "Keyboard"                                              |
+|       Matrix                                                  |
+|       7 Rows, 20 Columns                                      |
+\*-------------------------------------------------------------*/
+static const aura_core_laptop_zone g713rw_keyboard_zone =
+{
+    ZONE_EN_KEYBOARD,
+    &g713rw_keyboard_layout
+};
+
+static const aura_core_laptop_zone g713rw_lightbar_zone =
+{
+    "Lightbar",
+    &g713rw_lightbar_layout
+};
+
+static const aura_core_laptop_device g713rw_device =
+{
+    "G713RW",
+    {
+        &g713rw_keyboard_zone,
+        &g713rw_lightbar_zone,
+        nullptr,
+        nullptr,
+        nullptr,
+        nullptr
+    }
+};
+/*-------------------------------------------------------------*\
+|  ASUS ROG Strix G18 (G814JV)                                  |
+|                                                               |
+|  Zone "Keyboard"                                              |
+|       Matrix                                                  |
+|       7 Rows, 16 Columns                                      |
+\*-------------------------------------------------------------*/
+
+static const aura_core_laptop_zone g814rw_keyboard_zone =
+{
+    ZONE_EN_KEYBOARD,
+    &g814jv_keyboard_layout
+};
+
+static const aura_core_laptop_zone g814jv_lightbar_zone =
+{
+    "Lightbar",
+    &g814jv_lightbar_layout
+};
+
+static const aura_core_laptop_device g814jv_device =
+{
+    "G814JV",
+    {
+        &g814rw_keyboard_zone,
+        &g814jv_lightbar_zone,
+        nullptr,
+        nullptr,
+        nullptr,
+        nullptr
+    }
+};
+
+/*-------------------------------------------------------------------------*\
+|  DEVICE MASTER LIST                                                       |
+\*-------------------------------------------------------------------------*/
+const aura_core_laptop_device* aura_core_laptop_device_list_data[] =
+{
+/*-----------------------------------------------------------------*\
+|  KEYBOARDS                                                        |
+\*-----------------------------------------------------------------*/
+    &g533zm_device,
+    &g713rw_device,
+    &g814jv_device,
+};
+
+const unsigned int AURA_CORE_LAPTOP_DEVICE_COUNT = (sizeof(aura_core_laptop_device_list_data) / sizeof(aura_core_laptop_device_list_data[ 0 ]));
+const aura_core_laptop_device** aura_core_laptop_device_list = aura_core_laptop_device_list_data;
@@ -0,0 +1,50 @@
+#pragma once
+
+#include <string>
+#include <vector>
+#include "RGBController.h"
+#include "RGBControllerKeyNames.h"
+#include "KeyboardLayoutManager.h"
+
+#define AURA_CORE_LAPTOP_ZONES_MAX      6
+
+enum aura_core_kb_layout
+{
+    AURA_CORE_LAPTOP_KB_LAYOUT_ANSI     = 0x01,     /* US ANSI Layout                   */
+    AURA_CORE_LAPTOP_KB_LAYOUT_ISO      = 0x02,     /* EURO ISO Layout                  */
+    AURA_CORE_LAPTOP_KB_LAYOUT_ABNT     = 0x03,     /* Brazilian Layout                 */
+    AURA_CORE_LAPTOP_KB_LAYOUT_JIS      = 0x04,     /* Japanese Layout                  */
+};
+
+typedef struct
+{
+    std::string                         name;
+    keyboard_keymap_overlay_values*     layout_new;
+}   aura_core_laptop_zone;
+
+typedef struct
+{
+    uint8_t                             zone;
+    uint8_t                             row;
+    uint8_t                             col;
+    uint8_t                             index;
+    const char*                         name;
+}   aura_core_laptop_led;
+
+typedef struct
+{
+    std::string                         dmi_name;
+    const aura_core_laptop_zone*        zones[AURA_CORE_LAPTOP_ZONES_MAX];
+}   aura_core_laptop_device;
+
+/*-----------------------------------------------------*\
+| Aura Core Laptop Protocol Keyboards                   |
+\*-----------------------------------------------------*/
+#define AURA_STRIX_SCAR_15_PID                      0x19B6
+
+/*-----------------------------------------------------*\
+| These constant values are defined in                  |
+| AsusAuraCoreLaptopDevices.cpp                         |
+\*-----------------------------------------------------*/
+extern const unsigned int AURA_CORE_LAPTOP_DEVICE_COUNT;
+extern const aura_core_laptop_device** aura_core_laptop_device_list;
--- a/Show More
+++ b/Show More