More progress on getting CMake build on Linux

- fix many strings
- update missing translations

.github/workflows/issue_opened.yml

@@ -0,0 +1,21 @@
+name: Issue Opened
+
+on:
+  issues:
+    types: [opened,reopened]
+
+jobs:
+  issue_greeting:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - name: Greeting
+        run: gh issue comment "$NUMBER" --body "$BODY"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.issue.number }}
+          BODY: >
+            This Github repo is a mirror of the main repository on Gitlab.
+            For any new issue please refer to https://gitlab.com/CalcProgrammer1/OpenRGB/-/issues

.github/workflows/pr_opened.yml

@@ -0,0 +1,21 @@
+name: PR Opened
+
+on:
+  pull_request:
+    types: [opened,reopened]
+
+jobs:
+  pr_greeting:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Greeting
+        run: gh pr comment "$NUMBER" --body "$BODY"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.pull_request.number }}
+          BODY: >
+            This Github repo is a mirror of the main repository on Gitlab.
+            Please fork https://gitlab.com/CalcProgrammer1/OpenRGB/ and raise the appropriate merge request on Gitlab.

.gitlab-ci.yml

@@ -33,21 +33,18 @@
 stages:
   - build
   - test
+  - deploy
+
+variables:
+  GIT_DEPTH: 0
 
 before_script:
  - echo "started by ${GITLAB_USER_NAME}"
 
-#reusable templates
-.ccache_init: &ccache_init
-  before_script:
-    - export QT_SELECT=qt5
-    - export APPIMAGE_EXTRACT_AND_RUN=1
-
 #-----------------------------------------------------------------------#
 # Supported Devices Build Target                                        #
 #-----------------------------------------------------------------------#
 "Supported Devices":
-  <<: *ccache_init
   image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-amd64
   tags:
   - linux
@@ -71,7 +68,6 @@ before_script:
 # Linux (AppImage) i386 Build Target                                    #
 #-----------------------------------------------------------------------#
 "Linux i386 AppImage":
-  <<: *ccache_init
   image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-i386
   tags:
   - linux
@@ -92,11 +88,34 @@ before_script:
   rules:
     - !reference [.upstream_rules, rules]
 
+#-----------------------------------------------------------------------#
+# Linux (AppImage) Qt6 i386 Build Target                                #
+#-----------------------------------------------------------------------#
+"Linux i386 AppImage Qt6":
+  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 qt6
+
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_i386_Qt6_${CI_COMMIT_SHORT_SHA}"
+    paths:
+    - OpenRGB-i386.AppImage
+    - 60-openrgb.rules
+    - README.md
+    expire_in: 30 days
+
+  rules:
+    - !reference [.upstream_rules, rules]
+
 #-----------------------------------------------------------------------#
 # Linux (AppImage) amd64 Build Target                                   #
 #-----------------------------------------------------------------------#
 "Linux amd64 AppImage Base":
-  <<: *ccache_init
   image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-amd64
   stage: build
   script:
@@ -130,11 +149,34 @@ before_script:
   tags:
   - "saas-linux-small-amd64"
 
+#-----------------------------------------------------------------------#
+# Linux (AppImage) Qt6 amd64 Build Target                               #
+#-----------------------------------------------------------------------#
+"Linux amd64 AppImage Qt6":
+  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 qt6
+
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_amd64_Qt6_${CI_COMMIT_SHORT_SHA}"
+    paths:
+    - OpenRGB-amd64.AppImage
+    - 60-openrgb.rules
+    - README.md
+    expire_in: 30 days
+
+  rules:
+    - !reference [.upstream_rules, rules]
+
 #-----------------------------------------------------------------------#
 # Linux (AppImage) armhf Build Target                                   #
 #-----------------------------------------------------------------------#
 "Linux armhf AppImage":
-  <<: *ccache_init
   image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-armhf
   tags:
   - linux
@@ -155,11 +197,34 @@ before_script:
   rules:
     - !reference [.upstream_rules, rules]
 
+#-----------------------------------------------------------------------#
+# Linux (AppImage) Qt6 armhf Build Target                               #
+#-----------------------------------------------------------------------#
+"Linux armhf AppImage Qt6":
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-armhf
+  tags:
+  - linux
+  - armhf
+  stage: build
+  script:
+  - export $(dpkg-architecture)
+  - ./scripts/build-appimage.sh qt6
+
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_armhf_Qt6_${CI_COMMIT_SHORT_SHA}"
+    paths:
+    - OpenRGB-armhf.AppImage
+    - 60-openrgb.rules
+    - README.md
+    expire_in: 30 days
+
+  rules:
+    - !reference [.upstream_rules, rules]
+
 #-----------------------------------------------------------------------#
 # Linux (AppImage) arm64 Build Target                                   #
 #-----------------------------------------------------------------------#
 "Linux arm64 AppImage":
-  <<: *ccache_init
   image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-arm64
   tags:
   - linux
@@ -180,11 +245,34 @@ before_script:
   rules:
     - !reference [.upstream_rules, rules]
 
+#-----------------------------------------------------------------------#
+# Linux (AppImage) Qt6 arm64 Build Target                               #
+#-----------------------------------------------------------------------#
+"Linux arm64 AppImage Qt6":
+  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 qt6
+
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_arm64_Qt6_${CI_COMMIT_SHORT_SHA}"
+    paths:
+    - OpenRGB-arm64.AppImage
+    - 60-openrgb.rules
+    - README.md
+    expire_in: 30 days
+
+  rules:
+    - !reference [.upstream_rules, rules]
+
 #-----------------------------------------------------------------------#
 # 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
@@ -212,7 +300,6 @@ before_script:
 # Linux (.deb) Debian Bookworm amd64 Build Target                       #
 #-----------------------------------------------------------------------#
 "Linux amd64 .deb (Debian Bookworm)":
-  <<: *ccache_init
   image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-amd64
   tags:
   - linux
@@ -240,7 +327,6 @@ before_script:
 # Linux (.deb) Debian Bookworm armhf Build Target                       #
 #-----------------------------------------------------------------------#
 "Linux armhf .deb (Debian Bookworm)":
-  <<: *ccache_init
   image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-armhf
   tags:
   - linux
@@ -268,7 +354,6 @@ before_script:
 # Linux (.deb) Debian Bookworm arm64 Build Target                       #
 #-----------------------------------------------------------------------#
 "Linux arm64 .deb (Debian Bookworm)":
-  <<: *ccache_init
   image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-arm64
   tags:
   - linux
@@ -299,15 +384,12 @@ before_script:
   image: fedora:40
   stage: build
   script:
-  - dnf install rpmdevtools dnf-plugins-core libcurl-devel qt5-qtbase-devel -y
+  - dnf install rpmdevtools dnf-plugins-core libcurl-devel qt5-qtbase-devel git -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 ..
+  - cp -rp . /root/rpmbuild/SOURCES/OpenRGB
+  - cd /root/rpmbuild
   - dnf builddep SPECS/OpenRGB.spec -y
   - rpmbuild -ba SPECS/OpenRGB.spec
   - cd RPMS/x86_64/
@@ -410,61 +492,7 @@ before_script:
   - .shared_windows_runners
   stage: build
   script:
-  - $esc = "$([char]27)"
-  - $count = 0
-  - function _unix_tmsec_ { [int64](([datetime]::UtcNow)-(get-date "1/1/1970")).TotalSeconds }
-  - function _fold_start_ { param( [string]$TEXT_TAG ) $t=_unix_tmsec_; $global:count += 1; Write-Host -NoNewLine "`r`n`r`nsection_start:${t}:sect_${count}`r${esc}[0K${esc}[33m${TEXT_TAG}${esc}[39m`r`n"; }
-  - function _fold_final_ {                            $t=_unix_tmsec_;                     Write-Host -NoNewLine   "`r`n`r`nsection_end:${t}:sect_${count}`r${esc}[0K`r`n"           ; }
-
-
-  - _fold_start_ 'configuring the msvc environment variables'
-  - Push-Location "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Auxiliary/Build"
-  - '& cmd.exe /C "vcvarsall.bat x86 & set" | Foreach-Object { if ($_ -match "(.*?)=(.*)") { Set-Item -force -path "Env:\$($matches[1])" -value "$($matches[2])" } }'
-  - Pop-Location
-  - _fold_final_
-
-  - _fold_start_ 'downloading precompiled versions of qtbase, qttools (for windeployqt) and jom (for a more parallel nmake)'
-  - mkdir _qt
-  - mkdir _qt_download
-  - Push-Location _qt_download
-  - curl.exe -LJ -o qt-base.7z  'https://gitlab.com/OpenRGBDevelopers/openrgb-linux-ci-deb-builder/-/package_files/55610076/download'
-  - curl.exe -LJ -o qt-tools.7z 'https://gitlab.com/OpenRGBDevelopers/openrgb-linux-ci-deb-builder/-/package_files/55610097/download'
-  - curl.exe -LJ -o qt-jom.zip  'https://gitlab.com/OpenRGBDevelopers/openrgb-linux-ci-deb-builder/-/package_files/55610138/download'
-  - _fold_final_
-
-  - _fold_start_ 'extracting the downloaded qt binaries'
-  - 7z x qt-base.7z  '-o../_qt' -y
-  - 7z x qt-tools.7z '-o../_qt' -y
-  - 7z x qt-jom.zip  '-o../_qt' -y
-  - _fold_final_
-
-  - _fold_start_ 'turn the qt install from enterprise to foss; remove the licensing checks'
-  - ${qconfig-pri-folder} = '..\_qt\5.15.0\msvc2019\mkspecs\qconfig.pri'
-  - (Get-Content ${qconfig-pri-folder}).replace('QT_EDITION = Enterprise', 'QT_EDITION = OpenSource') | Set-Content ${qconfig-pri-folder}
-  - (Get-Content ${qconfig-pri-folder}).replace('QT_LICHECK = licheck.exe', '')                       | Set-Content ${qconfig-pri-folder}
-  - Pop-Location
-  - _fold_final_
-
-  - _fold_start_ 'run qmake and generate the msvc nmake makefile'
-  - mkdir _build; cd _build
-  - ..\_qt\5.15.0\msvc2019\bin\qmake ..\OpenRGB.pro
-  - _fold_final_
-
-  - _fold_start_ 'start the actual build with jom instead of nmake; for speed'
-  - ..\_qt\jom
-  - _fold_final_
-
-  - _fold_start_ 'run windeployqt to automatically copy the needed dll files'
-  - ..\_qt\5.15.0\msvc2019\bin\windeployqt --no-angle --no-translations --no-opengl-sw --no-system-d3d-compiler --no-compiler-runtime --no-webkit2 .\release\
-  - _fold_final_
-
-  - _fold_start_ 'Moving results for upload'
-  - mv release ../'OpenRGB Windows 32-bit'
-  - _fold_final_
-#  cache:
-#    key: same-key
-#    paths:
-#    - C:\vcpkg\installed\
+  - scripts\build-windows.bat 5.15.0 2019 32
   artifacts:
     name: "${CI_PROJECT_NAME}_Windows_32_${CI_COMMIT_SHORT_SHA}"
     paths:
@@ -476,6 +504,26 @@ before_script:
   rules:
     - !reference [.upstream_rules, rules]
 
+#-----------------------------------------------------------------------#
+# Windows (32-bit) Qt6 Build Target                                     #
+#-----------------------------------------------------------------------#
+"Windows 32 Qt6":
+  extends:
+  - .shared_windows_runners
+  stage: build
+  script:
+  - scripts\build-windows.bat 6.8.3 2022 32
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Windows_32_Qt6_${CI_COMMIT_SHORT_SHA}"
+    paths:
+    - 'OpenRGB Windows 32-bit'
+    exclude:
+    - 'OpenRGB Windows 32-bit\*.qm'
+    expire_in: 30 days
+
+  rules:
+    - !reference [.upstream_rules, rules]
+
 #-----------------------------------------------------------------------#
 # Windows (64-bit) Build Target                                         #
 #-----------------------------------------------------------------------#
@@ -484,61 +532,7 @@ before_script:
   - .shared_windows_runners
   stage: build
   script:
-  - $esc = "$([char]27)"
-  - $count = 0
-  - function _unix_tmsec_ { [int64](([datetime]::UtcNow)-(get-date "1/1/1970")).TotalSeconds }
-  - function _fold_start_ { param( [string]$TEXT_TAG ) $t=_unix_tmsec_; $global:count += 1; Write-Host -NoNewLine "`r`n`r`nsection_start:${t}:sect_${count}`r${esc}[0K${esc}[33m${TEXT_TAG}${esc}[39m`r`n"; }
-  - function _fold_final_ {                            $t=_unix_tmsec_;                     Write-Host -NoNewLine   "`r`n`r`nsection_end:${t}:sect_${count}`r${esc}[0K`r`n"           ; }
-
-
-  - _fold_start_ 'configuring the msvc environment variables'
-  - Push-Location "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Auxiliary/Build"
-  - '& cmd.exe /C "vcvarsall.bat x64 & set" | Foreach-Object { if ($_ -match "(.*?)=(.*)") { Set-Item -force -path "Env:\$($matches[1])" -value "$($matches[2])" } }'
-  - Pop-Location
-  - _fold_final_
-
-  - _fold_start_ 'downloading precompiled versions of qtbase, qttools (for windeployqt) and jom (for a more parallel nmake)'
-  - mkdir _qt
-  - mkdir _qt_download
-  - Push-Location _qt_download
-  - curl.exe -LJ -o qt-base.7z  'https://gitlab.com/OpenRGBDevelopers/openrgb-linux-ci-deb-builder/-/package_files/55610116/download'
-  - curl.exe -LJ -o qt-tools.7z 'https://gitlab.com/OpenRGBDevelopers/openrgb-linux-ci-deb-builder/-/package_files/55610131/download'
-  - curl.exe -LJ -o qt-jom.zip  'https://gitlab.com/OpenRGBDevelopers/openrgb-linux-ci-deb-builder/-/package_files/55610138/download'
-  - _fold_final_
-
-  - _fold_start_ 'extracting the downloaded qt binaries'
-  - 7z x qt-base.7z  '-o../_qt' -y
-  - 7z x qt-tools.7z '-o../_qt' -y
-  - 7z x qt-jom.zip  '-o../_qt' -y
-  - _fold_final_
-
-  - _fold_start_ 'turn the qt install from enterprise to foss; remove the licensing checks'
-  - ${qconfig-pri-folder} = '..\_qt\5.15.0\msvc2019_64\mkspecs\qconfig.pri'
-  - (Get-Content ${qconfig-pri-folder}).replace('QT_EDITION = Enterprise', 'QT_EDITION = OpenSource') | Set-Content ${qconfig-pri-folder}
-  - (Get-Content ${qconfig-pri-folder}).replace('QT_LICHECK = licheck.exe', '')                       | Set-Content ${qconfig-pri-folder}
-  - Pop-Location
-  - _fold_final_
-
-  - _fold_start_ 'run qmake and generate the msvc nmake makefile'
-  - mkdir _build; cd _build
-  - ..\_qt\5.15.0\msvc2019_64\bin\qmake ..\OpenRGB.pro
-  - _fold_final_
-
-  - _fold_start_ 'start the actual build with jom instead of nmake; for speed'
-  - ..\_qt\jom
-  - _fold_final_
-
-  - _fold_start_ 'run windeployqt to automatically copy the needed dll files'
-  - ..\_qt\5.15.0\msvc2019_64\bin\windeployqt --no-angle --no-translations --no-opengl-sw --no-system-d3d-compiler --no-compiler-runtime --no-webkit2 .\release\
-  - _fold_final_
-
-  - _fold_start_ 'Moving results for upload'
-  - mv release ../'OpenRGB Windows 64-bit'
-  - _fold_final_
-#  cache:
-#    key: same-key
-#    paths:
-#    - C:\vcpkg\installed\
+  - scripts\build-windows.bat 5.15.0 2019 64
   artifacts:
     name: "${CI_PROJECT_NAME}_Windows_64_${CI_COMMIT_SHORT_SHA}"
     paths:
@@ -560,7 +554,49 @@ before_script:
 "Windows 64 (gitlab.com runner)":
   extends: "Windows 64 Base"
   before_script:
-    choco install visualstudio2019-workload-vctools -y # gitlab provides vs2022, so add vs2019
+    - git clone https://gitlab.com/OpenRGBDevelopers/OpenRGB-Qt-Packages
+    - cd OpenRGB-Qt-Packages
+    - .\install-chocolatey.bat
+    - cd ..
+  rules:
+  - !reference [.fork_gitlab_runner_rules, rules]
+  tags:
+  - "saas-windows-medium-amd64"
+
+#-----------------------------------------------------------------------#
+# Windows (64-bit) Qt6 Build Target                                     #
+#-----------------------------------------------------------------------#
+"Windows 64 Qt6 Base":
+  extends:
+  - .shared_windows_runners
+  stage: build
+  script:
+  - scripts\build-windows.bat 6.8.3 2022 64
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Windows_64_Qt6_${CI_COMMIT_SHORT_SHA}"
+    paths:
+    - 'OpenRGB Windows 64-bit'
+    exclude:
+    - 'OpenRGB Windows 64-bit\*.qm'
+    expire_in: 30 days
+
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "push"
+      when: never
+
+
+"Windows 64 Qt6":
+  extends: "Windows 64 Qt6 Base"
+  rules:
+  - !reference [.fork_local_runner_rules, rules]
+
+"Windows 64 Qt6 (gitlab.com runner)":
+  extends: "Windows 64 Qt6 Base"
+  before_script:
+    - git clone https://gitlab.com/OpenRGBDevelopers/OpenRGB-Qt-Packages
+    - cd OpenRGB-Qt-Packages
+    - .\install-chocolatey.bat
+    - cd ..
   rules:
   - !reference [.fork_gitlab_runner_rules, rules]
   tags:
@@ -618,3 +654,30 @@ before_script:
   - if: $CI_PIPELINE_SOURCE == "push"
     when: manual
     allow_failure: true
+
+#-----------------------------------------------------------------------#
+# Windows (64-bit) MSI Target                                           #
+#-----------------------------------------------------------------------#
+"Windows 64 MSI":
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-i386
+  stage: deploy
+  tags:
+  - linux
+  - i386
+  script:
+  -  ls -la
+  -  ls -la "OpenRGB Windows 64-bit/"
+  -  ./scripts/build-msi.sh
+  dependencies:
+  - "Windows 64"
+  needs:
+  - "Windows 64"
+
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Windows_64_msi_${CI_COMMIT_SHORT_SHA}"
+    paths:
+    - OpenRGB_Windows_64.msi
+    expire_in: 30 days
+
+  rules:
+    - !reference [.upstream_rules, rules]

.gitlab/issue_templates/New Device.md

@@ -23,9 +23,9 @@ Please add a link to the manufacturer's product page beneath this line
 ~"DeviceType::IDK" <!-- I Don't know -->
 ~"DeviceType::USB" <!-- The device connects to an internal header or external usb port -->
 ~"DeviceType::GPU::AMD" <!-- The device is an AMD GPU -->
-~"DeviceType::GPU::NVidia" <!-- The device is a NVidia GPU -->
+~"DeviceType::GPU::Nvidia" <!-- The device is a Nvidia GPU -->
 ~"DeviceType::SMBus" <!-- The device is connected to the SMBus eg. RAM -->
-~"DeviceType::WMI"  <!-- The device is controlled thru Windows Management Instrumentation -->
+~"DeviceType::WMI"  <!-- The device is controlled through Windows Management Instrumentation -->
 
 <!-- Please delete any lines that are not relevant -->
 

CMakeLists.txt

@@ -0,0 +1,243 @@
+#-----------------------------------------------------------#
+# CMakeLists.txt                                            #
+#                                                           #
+#   CMake configuration for building OpenRGB                #
+#                                                           #
+#   Adam Honse (CalcProgrammer1)                24 May 2025 #
+#                                                           #
+#   This file is part of the OpenRGB project                #
+#   SPDX-License-Identifier: GPL-2.0-only                   #
+#-----------------------------------------------------------#
+
+cmake_minimum_required(VERSION 3.16)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
+
+#-----------------------------------------------------------#
+# Project Definition                                        #
+#-----------------------------------------------------------#
+project(OpenRGB LANGUAGES CXX)
+
+#-----------------------------------------------------------#
+# Executable                                                #
+#-----------------------------------------------------------#
+add_executable(OpenRGB)
+
+#-----------------------------------------------------------#
+# CMake Configuration                                       #
+#-----------------------------------------------------------#
+set(CMAKE_CXX_STANDARD          17                          )
+set(CMAKE_CXX_STANDARD_REQUIRED ON                          )
+set(CMAKE_AUTOMOC               ON                          )
+set(CMAKE_AUTORCC               ON                          )
+set(CMAKE_AUTOUIC               ON                          )
+set(CMAKE_INCLUDE_CURRENT_DIR   ON                          )
+
+#-----------------------------------------------------------#
+# Qt Configuration                                          #
+#-----------------------------------------------------------#
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
+qt_standard_project_setup()
+
+#-----------------------------------------------------------#
+# Version                                                   #
+#-----------------------------------------------------------#
+set(MAJOR       "0"                                         )
+set(MINOR       "9"                                         )
+set(SUFFIX      "git"                                       )
+
+#-----------------------------------------------------------#
+# Git Information                                           #
+#-----------------------------------------------------------#
+set(LASTTAG     "release_${MAJOR}.${MINOR}"                 )
+
+execute_process(COMMAND git rev-parse --short=7 HEAD
+                OUTPUT_VARIABLE SHORTHASH
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+execute_process(COMMAND git rev-list --count ${LASTTAG}..HEAD
+                OUTPUT_VARIABLE COMMITS
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+execute_process(COMMAND sh ${CMAKE_SOURCE_DIR}/scripts/git-get-branch.sh
+                OUTPUT_VARIABLE GITBRANCH
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+#-----------------------------------------------------------#
+# Version Strings                                           #
+#-----------------------------------------------------------#
+set(VERSION_NUM "${MAJOR}.${MINOR}.${COMMITS}"              )
+set(VERSION_STR "${MAJOR}.${MINOR}"                         )
+
+set(VERSION_DEB ${VERSION_NUM}                              )
+set(VERSION_WIX ${VERSION_NUM}                              )
+set(VERSION_AUR ${VERSION_NUM}                              )
+set(VERSION_RPM ${VERSION_NUM}                              )
+
+#-----------------------------------------------------------#
+# If suffix is "git", use package-specific git versioning   #
+# Otherwise, append suffix if it is not empty               #
+#-----------------------------------------------------------#
+if("${SUFFIX}" STREQUAL "git")
+set(VERSION_STR "${VERSION_STR}+ (${SUFFIX}${COMMITS})"     )
+set(VERSION_DEB "${VERSION_DEB}~git${SHORTHASH}"            )
+set(VERSION_AUR "${VERSION_AUR}.g${SHORTHASH}"              )
+set(VERSION_RPM "${VERSION_RPM}^git${SHORTHASH}"            )
+elseif(NOT "${SUFFIX}" STREQUAL "")
+set(VERSION_STR "${VERSION_STR}+ (${SUFFIX})"               )
+set(VERSION_DEB "${VERSION_DEB}~${SUFFIX}"                  )
+set(VERSION_AUR "${VERSION_AUR}.${SUFFIX}"                  )
+set(VERSION_RPM "${VERSION_RPM}^${SUFFIX}"                  )
+endif()
+
+#-----------------------------------------------------------#
+# Print build configuration information                     #
+#-----------------------------------------------------------#
+message(STATUS "OpenRGB ${VERSION_STR} CMake Build"         )
+message(STATUS "-------------------------------------------")
+message(STATUS "  Last release tag:      ${LASTTAG}"        )
+message(STATUS "  Shorthash:             ${SHORTHASH}"      )
+message(STATUS "  Commits since release: ${COMMITS}"        )
+message(STATUS "  Git branch:            ${GITBRANCH}"      )
+message(STATUS "  Version:  Main:        ${VERSION_STR}"    )
+message(STATUS "            Windows:     ${VERSION_WIX}"    )
+message(STATUS "            Debian:      ${VERSION_DEB}"    )
+message(STATUS "            Arch (AUR):  ${VERSION_AUR}"    )
+message(STATUS "            Fedora:      ${VERSION_RPM}"    )
+
+#-----------------------------------------------------------#
+# Build list of controller headers, include directories,    #
+# and source files                                          #
+#-----------------------------------------------------------#
+file(GLOB_RECURSE children LIST_DIRECTORIES true
+    "${CMAKE_SOURCE_DIR}/Controllers/*"                     )
+
+foreach(child ${children})
+    if(IS_DIRECTORY ${curdir}/${child})
+        list(APPEND CONTROLLER_INC ${child})
+    endif()
+endforeach()
+
+file(GLOB_RECURSE CONTROLLER_H
+    "${CMAKE_SOURCE_DIR}/Controllers/*.h"                   )
+
+file(GLOB_RECURSE CONTROLLER_CPP
+    "${CMAKE_SOURCE_DIR}/Controllers/*.cpp"                 )
+
+#-----------------------------------------------------------#
+# Remove OS-specific files from the overall controller      #
+# headers and sources lists.  The suffixes _Windows, _Linux,#
+# _FreeBSD, and _MacOS are usable to denote that a file     #
+# only applies to one or more OSes.  The suffixes may be    #
+# combined such as <file>_Windows_Linux.cpp.                #
+#-----------------------------------------------------------#
+file(GLOB_RECURSE CONTROLLER_H_WINDOWS
+    "${CMAKE_SOURCE_DIR}/Controllers/*_Windows*.h"          )
+file(GLOB_RECURSE CONTROLLER_CPP_WINDOWS
+    "${CMAKE_SOURCE_DIR}/Controllers/*_Windows*.cpp"        )
+file(GLOB_RECURSE CONTROLLER_H_LINUX
+    "${CMAKE_SOURCE_DIR}/Controllers/*_Linux*.h"            )
+file(GLOB_RECURSE CONTROLLER_CPP_LINUX
+    "${CMAKE_SOURCE_DIR}/Controllers/*_Linux*.cpp"          )
+file(GLOB_RECURSE CONTROLLER_H_MACOS
+    "${CMAKE_SOURCE_DIR}/Controllers/*_MacOS*.h"            )
+file(GLOB_RECURSE CONTROLLER_CPP_MACOS
+    "${CMAKE_SOURCE_DIR}/Controllers/*_MacOS*.cpp"          )
+file(GLOB_RECURSE CONTROLLER_H_FREEBSD
+    "${CMAKE_SOURCE_DIR}/Controllers/*_FreeBSD*.h"          )
+file(GLOB_RECURSE CONTROLLER_CPP_FREEBSD
+    "${CMAKE_SOURCE_DIR}/Controllers/*_FreeBSD*.cpp"        )
+
+list(REMOVE_ITEM CONTROLLER_H   ${CONTROLLER_H_WINDOWS}     )
+list(REMOVE_ITEM CONTROLLER_CPP ${CONTROLLER_CPP_WINDOWS}   )
+list(REMOVE_ITEM CONTROLLER_H   ${CONTROLLER_H_LINUX}       )
+list(REMOVE_ITEM CONTROLLER_CPP ${CONTROLLER_CPP_LINUX}     )
+list(REMOVE_ITEM CONTROLLER_H   ${CONTROLLER_H_MACOS}       )
+list(REMOVE_ITEM CONTROLLER_CPP ${CONTROLLER_CPP_MACOS}     )
+list(REMOVE_ITEM CONTROLLER_H   ${CONTROLLER_H_FREEBSD}     )
+list(REMOVE_ITEM CONTROLLER_CPP ${CONTROLLER_CPP_FREEBSD}   )
+
+target_sources(OpenRGB PRIVATE ${CONTROLLER_CPP}            )
+target_include_directories(OpenRGB PRIVATE ${CONTROLLER_INC})
+
+target_include_directories(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/AutoStart)
+
+target_include_directories(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/dmiinfo)
+target_sources(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/dmiinfo/dmiinfo.cpp)
+
+target_include_directories(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/hidapi_wrapper)
+
+target_include_directories(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/i2c_smbus)
+
+target_include_directories(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/i2c_tools)
+target_sources(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/i2c_tools/i2c_tools.cpp)
+
+target_include_directories(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/interop)
+target_include_directories(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/KeyboardLayoutManager)
+target_include_directories(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/net_port)
+target_include_directories(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/pci_ids)
+target_include_directories(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/qt)
+target_include_directories(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/RGBController)
+target_include_directories(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/scsiapi)
+target_include_directories(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/serial_port)
+target_include_directories(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/SPDAccessor)
+target_include_directories(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/super_io)
+target_include_directories(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/SuspendResume)
+target_include_directories(OpenRGB PRIVATE ${CMAKE_SOURCE_DIR}/wmi)
+
+#-----------------------------------------------------------#
+# CRCpp                                                     #
+#-----------------------------------------------------------#
+set(CRCPP_DIR ${CMAKE_SOURCE_DIR}/dependencies/CRCpp)
+
+add_library(CRCpp INTERFACE)
+target_include_directories(CRCpp INTERFACE ${CRCPP_DIR}/)
+
+target_link_libraries(OpenRGB CRCpp)
+
+#-----------------------------------------------------------#
+# hidapi                                                    #
+#-----------------------------------------------------------#
+find_package(hidapi REQUIRED)
+target_link_libraries(OpenRGB hidapi::hidapi)
+
+#-----------------------------------------------------------#
+# httplib                                                   #
+#-----------------------------------------------------------#
+set(HTTPLIB_DIR ${CMAKE_SOURCE_DIR}/dependencies/httplib)
+
+add_library(httplib INTERFACE)
+target_include_directories(httplib INTERFACE ${HTTPLIB_DIR}/)
+
+target_link_libraries(OpenRGB httplib)
+
+#-----------------------------------------------------------#
+# libe131                                                   #
+#-----------------------------------------------------------#
+set(LIBE131_DIR ${CMAKE_SOURCE_DIR}/dependencies/libe131)
+
+add_library(libe131 STATIC)
+target_include_directories(libe131 PUBLIC ${LIBE131_DIR}/src)
+target_sources(libe131 PRIVATE ${LIBE131_DIR}/src/e131.c)
+
+target_link_libraries(OpenRGB libe131)
+
+#-----------------------------------------------------------#
+# libusb                                                    #
+#-----------------------------------------------------------#
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(libusb-1.0 REQUIRED IMPORTED_TARGET GLOBAL libusb-1.0)
+
+target_link_libraries(OpenRGB PkgConfig::libusb-1.0)
+
+#-----------------------------------------------------------#
+# hueplusplus                                               #
+#-----------------------------------------------------------#
+add_subdirectory(${CMAKE_SOURCE_DIR}/dependencies/hueplusplus-1.2.0)
+target_link_libraries(OpenRGB hueplusplusstatic)
+
+#-----------------------------------------------------------#
+# nlohmann_json                                             #
+#-----------------------------------------------------------#
+find_package(nlohmann_json REQUIRED)
+target_link_libraries(OpenRGB nlohmann_json)

Controllers/AlienwareController/AlienwareController.cpp

@@ -99,6 +99,11 @@ AlienwareController::AlienwareController(hid_device* dev_handle, const hid_devic
     report              = Report(ALIENWARE_COMMAND_REPORT_CONFIG);
     alienware_platform_id platform_id = report.data[4] << 8 | report.data[5];
 
+    /*-----------------------------------------------------*\
+    | Check if the device reports the wrong number of zones |
+    \*-----------------------------------------------------*/
+    unsigned number_of_zones = zone_quirks_table.count(platform_id) ? zone_quirks_table.at(platform_id) : report.data[6];
+
     /*-----------------------------------------------------*\
     | Get firmware version                                  |
     \*-----------------------------------------------------*/
@@ -109,11 +114,6 @@ AlienwareController::AlienwareController(hid_device* dev_handle, const hid_devic
     fw_string << static_cast<unsigned>(report.data[4]) << '.' << static_cast<unsigned>(report.data[5]) << '.' << static_cast<unsigned>(report.data[6]);
     version             = fw_string.str();
 
-    /*-----------------------------------------------------*\
-    | Check if the device reports the wrong number of zones |
-    \*-----------------------------------------------------*/
-    unsigned number_of_zones = zone_quirks_table.count(platform_id) ? zone_quirks_table.at(platform_id) : report.data[6];
-
     /*-----------------------------------------------------*\
     | Initialize Alienware zones                            |
     \*-----------------------------------------------------*/

Controllers/AlienwareMonitorController/AlienwareAW3423DWFController.cpp

@@ -0,0 +1,183 @@
+/*---------------------------------------------------------*\
+| AlienwareAW3423DWFController.cpp                          |
+|                                                           |
+|   Driver for the Alienware AW3423DWF monitor              |
+|                                                           |
+|   Ferréol DUBOIS COLI (Fefe_du_973)           23 Jan 2025 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include <bitset>
+#include <chrono>
+#include <cstring>
+#include <thread>
+
+#include "AlienwareAW3423DWFController.h"
+#include "StringUtils.h"
+
+AlienwareAW3423DWFController::AlienwareAW3423DWFController(hid_device *dev_handle, const char *path) : dev(dev_handle), location(path){}
+
+void AlienwareAW3423DWFController::SendControlPacket(const unsigned char *data, size_t length)
+{
+    unsigned char buffer[256] = {0x00};
+    memcpy(buffer + 1, data, length);
+
+    hid_write(dev, buffer, length + 1);
+}
+
+std::vector<unsigned char> AlienwareAW3423DWFController::GetReportResponse()
+{
+    uint8_t buffer[193];
+
+    memset(buffer, 0, 193);
+
+    hid_get_input_report(dev, buffer, 193);
+
+    return std::vector<unsigned char>(buffer + 1, buffer + 18);
+}
+
+void AlienwareAW3423DWFController::PerformLogin()
+{
+    unsigned char init_packet[64] =
+    {
+        0x40, 0xE1, 0x01
+    };
+    SendControlPacket(init_packet, 4);
+
+    std::vector<unsigned char> response = GetReportResponse();
+
+    std::vector<unsigned char> key = GenerateKey(response);
+
+    unsigned char login_packet[192] = {0x00};
+    login_packet[0] = 0x40;
+    login_packet[1] = 0xE1;
+    login_packet[2] = 0x02;
+    memcpy(login_packet + 64, key.data(), key.size());
+
+    SendControlPacket(login_packet, 192);
+}
+
+void AlienwareAW3423DWFController::SendColor(unsigned char led_id, unsigned char r, unsigned char g, unsigned char b)
+{
+    unsigned char led_id_2 = (led_id == 0x01) ? 0xf6 : (led_id == 0x02) ? 0xf5
+                                                   : (led_id == 0x08)   ? 0xff
+                                                                        : 0xfc;
+    PerformLogin();
+
+    unsigned char color_packet[192] = {0x00};
+
+    color_packet[0]  = 0x40;
+    color_packet[1]  = 0xC6;
+    color_packet[6]  = 0x0A;
+    color_packet[8]  = 0x6E;
+    color_packet[10] = 0x82;
+    color_packet[64] = 0x51;
+    color_packet[65] = 0x87;
+    color_packet[66] = 0xD0;
+    color_packet[67] = 0x04;
+
+    color_packet[68] = led_id;
+    color_packet[69] = r;
+    color_packet[70] = g;
+    color_packet[71] = b;
+    color_packet[72] = 0x64;
+    color_packet[73] = led_id_2;
+
+    SendControlPacket(color_packet, 192);
+
+    std::this_thread::sleep_for(std::chrono::milliseconds(200));
+}
+
+std::vector<unsigned char> AlienwareAW3423DWFController::GenerateKey(
+    const std::vector<unsigned char> &response)
+{
+    std::vector<unsigned char> syn_key(8, 0);
+
+    const std::vector<unsigned char> oem_key = {
+        0xf5, 0x3f, 0xc1, 0x39, 0x44, 0x3a, 0x31, 0x79, 0x0d, 0xb1, 0x82, 0x76
+    };
+
+    size_t sk_idx = 0, ok_idx = 0;
+    while(ok_idx < oem_key.size() && sk_idx < 8)
+    {
+        unsigned char ok_sub_len = (oem_key[ok_idx] & 1) + ((oem_key[ok_idx] & 0x10) >> 4);
+
+        for(unsigned int i = 0; i < ok_sub_len && sk_idx < 8; i++)
+        {
+            syn_key[sk_idx] = oem_key[ok_idx + 1] ^ oem_key[ok_idx];
+            ok_idx++;
+            sk_idx++;
+        }
+        ok_idx++;
+    }
+
+    std::vector<unsigned char> out_buffer;
+
+    uint16_t v15 = static_cast<uint16_t>(response[15]) |
+                   (static_cast<uint16_t>(response[0]) << 8);
+    bool parity_odd = (std::bitset<16>(v15).count() % 2 != 0);
+
+    if(parity_odd)
+    {
+        size_t end = std::min<size_t>(8, response.size());
+        out_buffer = std::vector<unsigned char>(response.begin(), response.begin() + end);
+
+        if(response.size() > 14)
+        {
+            unsigned char idx = response[14] & 0x07;
+            if((idx + 8) < response.size())
+            {
+                out_buffer[idx] ^= response[idx + 8];
+            }
+        }
+    }
+    else
+    {
+        size_t start = std::min<size_t>(8, response.size());
+        size_t end = std::min<size_t>(start + 8, response.size());
+        out_buffer = std::vector<unsigned char>(response.begin() + start, response.begin() + end);
+
+        if(response.size() > 6)
+        {
+            unsigned char idx = response[6] & 0x07;
+            if(idx < response.size())
+            {
+                out_buffer[idx] ^= response[idx];
+            }
+        }
+    }
+
+    for(size_t i = 0; i < 8 && i < out_buffer.size(); i++)
+    {
+        syn_key[i] ^= out_buffer[i];
+    }
+
+    return syn_key;
+}
+
+AlienwareAW3423DWFController::~AlienwareAW3423DWFController()
+{
+    if(dev)
+    {
+        hid_close(dev);
+        dev = nullptr;
+    }
+}
+
+std::string AlienwareAW3423DWFController::GetLocation()
+{
+    return "HID: " + location;
+}
+
+std::string AlienwareAW3423DWFController::GetSerialString()
+{
+    wchar_t serial[256];
+    if(hid_get_serial_number_string(dev, serial, 256) >= 0)
+    {
+        std::wstring ws(serial);
+        return StringUtils::wstring_to_string(ws);
+    }
+    return "";
+}

Controllers/AlienwareMonitorController/AlienwareAW3423DWFController.h

@@ -0,0 +1,40 @@
+/*---------------------------------------------------------*\
+| AlienwareAW3423DWFController.h                            |
+|                                                           |
+|   Driver for the Alienware AW3423DWF monitor              |
+|                                                           |
+|   Ferréol DUBOIS COLI (Fefe_du_973)           23 Jan 2025 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include <hidapi.h>
+#include <vector>
+#include <string>
+
+class AlienwareAW3423DWFController
+{
+public:
+    AlienwareAW3423DWFController(hid_device* dev_handle, const char* path);
+    ~AlienwareAW3423DWFController();
+
+    std::string GetLocation();
+    std::string GetSerialString();
+    void SendColor(unsigned char led_id, unsigned char r, unsigned char g, unsigned char b);
+
+private:
+    hid_device* dev;
+    std::string location;
+    unsigned char endpoint_out = 0x02;
+    unsigned char endpoint_in = 0x81;
+
+    static const std::vector<std::vector<unsigned char>> OEM_KEYS;
+
+    void PerformLogin();
+    std::vector<unsigned char> GenerateKey(const std::vector<unsigned char>& response);
+    void SendControlPacket(const unsigned char* data, size_t length);
+    std::vector<unsigned char> GetReportResponse();
+};

Controllers/AlienwareMonitorController/AlienwareMonitorController.cpp

@@ -0,0 +1,136 @@
+/*---------------------------------------------------------*\
+| AlienwareMonitorController.cpp                            |
+|                                                           |
+|   Detector for Alienware monitors                         |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                08 May 2025 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include <chrono>
+#include <cstring>
+#include <thread>
+
+#include "AlienwareMonitorController.h"
+
+AlienwareMonitorController::AlienwareMonitorController(hid_device *dev_handle, const char *path)
+{
+    dev         = dev_handle;
+    location    = path;
+
+    Initialize();
+}
+
+AlienwareMonitorController::~AlienwareMonitorController()
+{
+    hid_close(dev);
+}
+
+std::string AlienwareMonitorController::GetLocation()
+{
+    return("HID: " + location);
+}
+
+std::string AlienwareMonitorController::GetSerialString()
+{
+    return("");
+}
+
+void fillInChecksum(unsigned char *packet)
+{
+    unsigned char checksum = 110;
+
+    for(unsigned int index = 5; index <= 13; index++)
+    {
+      checksum ^= packet[index];
+    }
+
+    packet[14] = checksum;
+}
+
+void AlienwareMonitorController::SendColor(unsigned char led_id, unsigned char r, unsigned char g, unsigned char b)
+{
+    unsigned char packet[65];
+
+    memset(packet, 0xFF, sizeof(packet));
+
+    packet[1] = 0x92;
+    packet[2] = 0x37;
+    packet[3] = 0x0a;
+    packet[4] = 0x00;
+    packet[5] = 0x51;
+    packet[6] = 0x87;
+    packet[7] = 0xd0;
+    packet[8] = 0x04;
+
+    packet[9] = led_id;
+    packet[10] = r;
+    packet[11] = g;
+    packet[12] = b;
+    packet[13] = 0x64;
+
+    fillInChecksum(packet);
+
+    hid_write(dev, packet, sizeof(packet));
+
+    /*-----------------------------------------------------*\
+    | Delay 50 milliseconds                                 |
+    \*-----------------------------------------------------*/
+    std::this_thread::sleep_for(std::chrono::milliseconds(50));
+}
+
+void AlienwareMonitorController::Initialize()
+{
+    unsigned char packet[65];
+
+    memset(packet, 0xFF, sizeof(packet));
+
+    packet[1] = 0x95;
+    packet[2] = 0x00;
+    packet[3] = 0x00;
+    packet[4] = 0x00;
+
+    hid_write(dev, packet, sizeof(packet));
+
+    /*-----------------------------------------------------*\
+    | Delay 50 milliseconds                                 |
+    \*-----------------------------------------------------*/
+    std::this_thread::sleep_for(std::chrono::milliseconds(50));
+
+    memset(packet, 0xFF, sizeof(packet));
+
+    packet[1] = 0x92;
+    packet[2] = 0x37;
+    packet[3] = 0x08;
+    packet[4] = 0x00;
+    packet[5] = 0x51;
+    packet[6] = 0x85;
+    packet[7] = 0x01;
+    packet[8] = 0xFE;
+    packet[9] = 0x03;
+    packet[10] = 0x00;
+    packet[11] = 0x06;
+    packet[12] = 0x40;
+
+    hid_write(dev, packet, sizeof(packet));
+
+    /*-----------------------------------------------------*\
+    | Delay 50 milliseconds                                 |
+    \*-----------------------------------------------------*/
+    std::this_thread::sleep_for(std::chrono::milliseconds(50));
+
+    memset(packet, 0x00, sizeof(packet));
+
+    packet[1] = 0x93;
+    packet[2] = 0x37;
+    packet[3] = 0x12;
+
+    hid_write(dev, packet, sizeof(packet));
+
+    /*-----------------------------------------------------*\
+    | Delay 50 milliseconds                                 |
+    \*-----------------------------------------------------*/
+    std::this_thread::sleep_for(std::chrono::milliseconds(50));
+}

Controllers/AlienwareMonitorController/AlienwareMonitorController.h

@@ -0,0 +1,33 @@
+/*---------------------------------------------------------*\
+| AlienwareMonitorController.h                              |
+|                                                           |
+|   Detector for Alienware monitors                         |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                08 May 2025 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include <hidapi.h>
+#include <vector>
+#include <string>
+
+class AlienwareMonitorController
+{
+public:
+AlienwareMonitorController(hid_device* dev_handle, const char* path);
+    ~AlienwareMonitorController();
+
+    std::string GetLocation();
+    std::string GetSerialString();
+    void SendColor(unsigned char led_id, unsigned char r, unsigned char g, unsigned char b);
+
+private:
+    hid_device* dev;
+    std::string location;
+
+    void Initialize();
+};

Controllers/AlienwareMonitorController/AlienwareMonitorControllerDetect.cpp

@@ -0,0 +1,66 @@
+/*---------------------------------------------------------*\
+| AlienwareMonitorControllerDetect.cpp                      |
+|                                                           |
+|   Detector for Alienware monitors                         |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                08 May 2025 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include "Detector.h"
+#include "AlienwareAW3423DWFController.h"
+#include "AlienwareMonitorController.h"
+#include "RGBController_AlienwareAW3423DWF.h"
+#include "RGBController_AlienwareMonitor.h"
+#include <hidapi.h>
+
+/*---------------------------------------------------------*\
+| Alienware Vendor ID                                       |
+\*---------------------------------------------------------*/
+#define ALIENWARE_VID                               0x187C
+
+/*---------------------------------------------------------*\
+| Alienware Vendor ID                                       |
+\*---------------------------------------------------------*/
+#define ALIENWARE_AW3423DWF_PID                     0x100E
+#define ALIENWARE_AW3225QF_PID                      0x1013
+#define ALIENWARE_USAGE_PAGE                        0xFFDA
+#define ALIENWARE_USAGE                             0x00DA
+
+/******************************************************************************************\
+*                                                                                          *
+*   AlienwareAW3423DWFControllerDetect                                                     *
+*                                                                                          *
+*       Tests the USB address to see if an Alienware AW3423DWF exists there.               *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectAlienwareAW3423DWFControllers(hid_device_info* info, const std::string&)
+{
+    hid_device* dev = hid_open_path(info->path);
+    if(dev)
+    {
+        AlienwareAW3423DWFController* controller = new AlienwareAW3423DWFController(dev, info->path);
+        RGBController_AlienwareAW3423DWF* rgb_controller = new RGBController_AlienwareAW3423DWF(controller);
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
+    }
+}
+
+void DetectAlienwareMonitorControllers(hid_device_info* info, const std::string& name)
+{
+    hid_device* dev = hid_open_path(info->path);
+
+    if(dev)
+    {
+        AlienwareMonitorController*     controller     = new AlienwareMonitorController(dev, info->path);
+        RGBController_AlienwareMonitor* rgb_controller = new RGBController_AlienwareMonitor(controller);
+        rgb_controller->name                           = name;
+
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
+    }
+}
+
+REGISTER_HID_DETECTOR("Alienware AW3423DWF", DetectAlienwareAW3423DWFControllers, ALIENWARE_VID, ALIENWARE_AW3423DWF_PID);
+REGISTER_HID_DETECTOR("Alienware AW3225QF", DetectAlienwareMonitorControllers, ALIENWARE_VID, ALIENWARE_AW3225QF_PID);

Controllers/AlienwareMonitorController/RGBController_AlienwareAW3423DWF.cpp

@@ -0,0 +1,141 @@
+/*---------------------------------------------------------*\
+| RGBController_AlienwareAW3423DWF.cpp                      |
+|                                                           |
+|   RGBController for the Alienware AW3423DWF monitor       |
+|                                                           |
+|   Ferréol DUBOIS COLI (Fefe_du_973)           23 Jan 2025 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include "RGBController_AlienwareAW3423DWF.h"
+
+/**------------------------------------------------------------------*\
+    @name AW3423DWF
+    @category Accessory
+    @type USB
+    @save :x:
+    @direct :white_check_mark:
+    @effects :x:
+    @detectors DetectAlienwareAW3423DWFControllers
+    @comment
+\*-------------------------------------------------------------------*/
+
+RGBController_AlienwareAW3423DWF::RGBController_AlienwareAW3423DWF(AlienwareAW3423DWFController* controller_ptr)
+{
+    controller              = controller_ptr;
+
+    name                    = "Alienware AW3423DWF";
+    vendor                  = "Alienware";
+    type                    = DEVICE_TYPE_MONITOR;
+    description             = "Alienware AW3423DWF Monitor Device";
+    location                = controller->GetLocation();
+    serial                  = controller->GetSerialString();
+
+    mode Direct;
+    Direct.name             = "Direct";
+    Direct.flags            = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode       = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
+    active_mode             = 0;
+
+    SetupZones();
+}
+
+RGBController_AlienwareAW3423DWF::~RGBController_AlienwareAW3423DWF()
+{
+    delete controller;
+}
+
+void RGBController_AlienwareAW3423DWF::SetupZones()
+{
+    zone Logo;
+    Logo.name               = "Logo";
+    Logo.type               = ZONE_TYPE_SINGLE;
+    Logo.leds_min           = 1;
+    Logo.leds_max           = 1;
+    Logo.leds_count         = 1;
+    Logo.matrix_map         = NULL;
+    zones.push_back(Logo);
+
+    led Logo_LED;
+    Logo_LED.name           = "Logo";
+    Logo_LED.value          = 0x01;
+    leds.push_back(Logo_LED);
+
+    zone Number;
+    Number.name             = "Number";
+    Number.type             = ZONE_TYPE_SINGLE;
+    Number.leds_min         = 1;
+    Number.leds_max         = 1;
+    Number.leds_count       = 1;
+    Number.matrix_map       = NULL;
+    zones.push_back(Number);
+
+    led Number_LED;
+    Number_LED.name         = "Number";
+    Number_LED.value        = 0x02;
+    leds.push_back(Number_LED);
+
+    zone PowerButton;
+    PowerButton.name        = "Power Button";
+    PowerButton.type        = ZONE_TYPE_SINGLE;
+    PowerButton.leds_min    = 1;
+    PowerButton.leds_max    = 1;
+    PowerButton.leds_count  = 1;
+    PowerButton.matrix_map  = NULL;
+    zones.push_back(PowerButton);
+
+    led PowerButton_LED;
+    PowerButton_LED.name    = "Power Button";
+    PowerButton_LED.value   = 0x08;
+    leds.push_back(PowerButton_LED);
+
+    SetupColors();
+}
+
+void RGBController_AlienwareAW3423DWF::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+}
+
+void RGBController_AlienwareAW3423DWF::DeviceUpdateLEDs()
+{
+    /*-----------------------------------------------------*\
+    | If all three colors are the same value, speed up the  |
+    | direct mode by using the ALL target (0x0B) instead of |
+    | setting each LED individually.                        |
+    \*-----------------------------------------------------*/
+    if((colors[0] == colors[1]) && (colors[1] == colors[2]))
+    {
+        unsigned char red = RGBGetRValue(colors[0]);
+        unsigned char grn = RGBGetGValue(colors[0]);
+        unsigned char blu = RGBGetBValue(colors[0]);
+        controller->SendColor(0x0B, red, grn, blu);
+    }
+    else
+    {
+        for(unsigned int led_idx = 0; led_idx < leds.size(); led_idx++)
+        {
+            UpdateSingleLED(led_idx);
+        }
+    }
+}
+
+void RGBController_AlienwareAW3423DWF::UpdateZoneLEDs(int /*zone*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_AlienwareAW3423DWF::UpdateSingleLED(int led)
+{
+    unsigned char red = RGBGetRValue(colors[led]);
+    unsigned char grn = RGBGetGValue(colors[led]);
+    unsigned char blu = RGBGetBValue(colors[led]);
+    controller->SendColor(leds[led].value, red, grn, blu);
+}
+
+void RGBController_AlienwareAW3423DWF::DeviceUpdateMode()
+{
+}

Controllers/AlienwareMonitorController/RGBController_AlienwareAW3423DWF.h

@@ -0,0 +1,34 @@
+/*---------------------------------------------------------*\
+| RGBController_AlienwareAW3423DWF.h                        |
+|                                                           |
+|   RGBController for the Alienware AW3423DWF monitor       |
+|                                                           |
+|   Ferréol DUBOIS COLI (Fefe_du_973)           23 Jan 2025 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include "AlienwareAW3423DWFController.h"
+#include "RGBController.h"
+
+class RGBController_AlienwareAW3423DWF : public RGBController
+{
+public:
+    explicit RGBController_AlienwareAW3423DWF(AlienwareAW3423DWFController* controller_ptr);
+    ~RGBController_AlienwareAW3423DWF();
+
+    void        SetupZones();
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+private:
+    AlienwareAW3423DWFController* controller;
+};

Controllers/AlienwareMonitorController/RGBController_AlienwareMonitor.cpp

@@ -0,0 +1,143 @@
+/*---------------------------------------------------------*\
+| RGBController_AlienwareMonitor.cpp                        |
+|                                                           |
+|   RGBController for Alienware monitors                    |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                08 May 2025 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include "RGBController_AlienwareMonitor.h"
+
+/**------------------------------------------------------------------*\
+    @name Alienware Monitor
+    @category Accessory
+    @type USB
+    @save :x:
+    @direct :white_check_mark:
+    @effects :x:
+    @detectors DetectAlienwareMonitorControllers
+    @comment
+\*-------------------------------------------------------------------*/
+
+RGBController_AlienwareMonitor::RGBController_AlienwareMonitor(AlienwareMonitorController* controller_ptr)
+{
+    controller              = controller_ptr;
+
+    name                    = "Alienware Monitor";
+    description             = "Alienware Monitor";
+    vendor                  = "Alienware";
+    type                    = DEVICE_TYPE_MONITOR;
+    location                = controller->GetLocation();
+    serial                  = controller->GetSerialString();
+
+    mode Direct;
+    Direct.name             = "Direct";
+    Direct.flags            = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode       = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
+    active_mode             = 0;
+
+    SetupZones();
+}
+
+RGBController_AlienwareMonitor::~RGBController_AlienwareMonitor()
+{
+    delete controller;
+}
+
+void RGBController_AlienwareMonitor::SetupZones()
+{
+    zone Logo;
+    Logo.name               = "Logo";
+    Logo.type               = ZONE_TYPE_SINGLE;
+    Logo.leds_min           = 1;
+    Logo.leds_max           = 1;
+    Logo.leds_count         = 1;
+    Logo.matrix_map         = NULL;
+    zones.push_back(Logo);
+
+    led Logo_LED;
+    Logo_LED.name           = "Logo";
+    Logo_LED.value          = 0x01;
+    leds.push_back(Logo_LED);
+
+    zone Number;
+    Number.name             = "Number";
+    Number.type             = ZONE_TYPE_SINGLE;
+    Number.leds_min         = 1;
+    Number.leds_max         = 1;
+    Number.leds_count       = 1;
+    Number.matrix_map       = NULL;
+    zones.push_back(Number);
+
+    led Number_LED;
+    Number_LED.name         = "Number";
+    Number_LED.value        = 0x02;
+    leds.push_back(Number_LED);
+
+    zone PowerButton;
+    PowerButton.name        = "Power Button";
+    PowerButton.type        = ZONE_TYPE_SINGLE;
+    PowerButton.leds_min    = 1;
+    PowerButton.leds_max    = 1;
+    PowerButton.leds_count  = 1;
+    PowerButton.matrix_map  = NULL;
+    zones.push_back(PowerButton);
+
+    led PowerButton_LED;
+    PowerButton_LED.name    = "Power Button";
+    PowerButton_LED.value   = 0x08;
+    leds.push_back(PowerButton_LED);
+
+    SetupColors();
+}
+
+void RGBController_AlienwareMonitor::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+
+}
+
+void RGBController_AlienwareMonitor::DeviceUpdateLEDs()
+{
+    /*-----------------------------------------------------*\
+    | If all three colors are the same value, speed up the  |
+    | direct mode by using the ALL target (0x0B) instead of |
+    | setting each LED individually.                        |
+    \*-----------------------------------------------------*/
+    if((colors[0] == colors[1]) && (colors[1] == colors[2]))
+    {
+        unsigned char red = RGBGetRValue(colors[0]);
+        unsigned char grn = RGBGetGValue(colors[0]);
+        unsigned char blu = RGBGetBValue(colors[0]);
+        controller->SendColor(0x0B, red, grn, blu);
+    }
+    else
+    {
+        for(unsigned int led_idx = 0; led_idx < leds.size(); led_idx++)
+        {
+            UpdateSingleLED(led_idx);
+        }
+    }
+}
+
+void RGBController_AlienwareMonitor::UpdateZoneLEDs(int /*zone*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_AlienwareMonitor::UpdateSingleLED(int led)
+{
+    unsigned char red = RGBGetRValue(colors[led]);
+    unsigned char grn = RGBGetGValue(colors[led]);
+    unsigned char blu = RGBGetBValue(colors[led]);
+    controller->SendColor(leds[led].value, red, grn, blu);
+}
+
+void RGBController_AlienwareMonitor::DeviceUpdateMode()
+{
+
+}

Controllers/AlienwareMonitorController/RGBController_AlienwareMonitor.h

@@ -0,0 +1,34 @@
+/*---------------------------------------------------------*\
+| RGBController_AlienwareMonitor.h                          |
+|                                                           |
+|   RGBController for Alienware monitors                    |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                08 May 2025 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "AlienwareMonitorController.h"
+
+class RGBController_AlienwareMonitor : public RGBController
+{
+public:
+RGBController_AlienwareMonitor(AlienwareMonitorController* controller_ptr);
+    ~RGBController_AlienwareMonitor();
+
+    void        SetupZones();
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+private:
+AlienwareMonitorController* controller;
+};

Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/AsusAuraCoreLaptopDevices.cpp

@@ -68,19 +68,19 @@ keyboard_keymap_overlay_values g533zm_layout
         }
     },
     {
-        /*---------------------------------------------------------------------------------------------------------*\
-        | 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 Stop
-        {   0,      3,      15,         100,        KEY_EN_MEDIA_PREVIOUS,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Previous
-        {   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 Next
-        {   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
+        /*-------------------------------------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                                             |
+        |   Zone,   Row,    Column,     Value,      Key,                        Alternate Name,             OpCode,                             |
+        \*-------------------------------------------------------------------------------------------------------------------------------------*/
+        {   0,      0,      15,          37,        KEY_EN_DELETE,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Delete
+        {   0,      1,      15,          58,        KEY_EN_MEDIA_PLAY_PAUSE,    KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Play / Pause
+        {   0,      2,      15,          79,        KEY_EN_MEDIA_STOP,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Stop
+        {   0,      3,      15,         100,        KEY_EN_MEDIA_PREVIOUS,      KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Previous
+        {   0,      4,      13,         139,        KEY_EN_UP_ARROW,            KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Up Arrow
+        {   0,      4,      15,         121,        KEY_EN_MEDIA_NEXT,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Next
+        {   0,      5,      12,         159,        KEY_EN_LEFT_ARROW,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Left Arrow
+        {   0,      5,      13,         160,        KEY_EN_DOWN_ARROW,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Down Arrow
+        {   0,      5,      14,         161,        KEY_EN_RIGHT_ARROW,         KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Right Arrow
     }
 };
 
@@ -94,30 +94,30 @@ keyboard_keymap_overlay_values g533zw_layout
         }
     },
     {
-        /*---------------------------------------------------------------------------------------------------------*\
-        | 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 Stop
-        {   0,      3,      15,         100,        KEY_EN_MEDIA_PREVIOUS,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Previous
-        {   0,      4,      15,         121,        KEY_EN_MEDIA_NEXT,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Media Next
-        {   0,      5,       1,         127,        KEY_EN_LEFT_FUNCTION,       KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Left Function key
-        {   0,      5,       4,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove Unused key
-        {   0,      5,      11,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove Right Func key
-        {   0,      5,      11,           0,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove Right Context key
-        {   0,      5,      13,         139,        KEY_EN_UP_ARROW,            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Up Arrow
-        {   0,      5,      15,         142,        KEY_EN_PRINT_SCREEN,        KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Print Screen
-        {   0,      5,      16,         175,        "Keystone",                 KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Keystone (Red only)
-        {   0,      6,      12,         159,        KEY_EN_LEFT_ARROW,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Left Arrow on new row
-        {   0,      6,      13,         160,        KEY_EN_DOWN_ARROW,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Down Arrow
-        {   0,      6,      14,         161,        KEY_EN_RIGHT_ARROW,         KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Right Arrow
-        {   0,      0,       2,           2,        KEY_EN_MEDIA_VOLUME_DOWN,   KEYBOARD_OPCODE_INSERT_ROW,         },  // Insert Row before function keys
-        {   0,      0,       3,           3,        KEY_EN_MEDIA_VOLUME_UP,     KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Vol Up
-        {   0,      0,       4,           4,        "Mic On / Off",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Mic On / Off
-        {   0,      0,       5,           5,        "Hyperfan",                 KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Hyperfan
-        {   0,      0,       6,           6,        "Armoury Crate",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Armoury Crate
+        /*-------------------------------------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                                             |
+        |   Zone,   Row,    Column,     Value,      Key,                        Alternate Name,             OpCode,                             |
+        \*-------------------------------------------------------------------------------------------------------------------------------------*/
+        {   0,      0,      15,          37,        KEY_EN_DELETE,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Delete
+        {   0,      1,      15,          58,        KEY_EN_MEDIA_PLAY_PAUSE,    KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Play / Pause
+        {   0,      2,      15,          79,        KEY_EN_MEDIA_STOP,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Stop
+        {   0,      3,      15,         100,        KEY_EN_MEDIA_PREVIOUS,      KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Previous
+        {   0,      4,      15,         121,        KEY_EN_MEDIA_NEXT,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Media Next
+        {   0,      5,       1,         127,        KEY_EN_LEFT_FUNCTION,       KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Left Function key
+        {   0,      5,       4,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove Unused key
+        {   0,      5,      11,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove Right Func key
+        {   0,      5,      11,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove Right Context key
+        {   0,      5,      13,         139,        KEY_EN_UP_ARROW,            KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Up Arrow
+        {   0,      5,      15,         142,        KEY_EN_PRINT_SCREEN,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Print Screen
+        {   0,      5,      16,         175,        "Keystone",                 KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Keystone (Red only)
+        {   0,      6,      12,         159,        KEY_EN_LEFT_ARROW,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Left Arrow on new row
+        {   0,      6,      13,         160,        KEY_EN_DOWN_ARROW,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Down Arrow
+        {   0,      6,      14,         161,        KEY_EN_RIGHT_ARROW,         KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Right Arrow
+        {   0,      0,       2,           2,        KEY_EN_MEDIA_VOLUME_DOWN,   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_ROW,         },  // Insert Row before function keys
+        {   0,      0,       3,           3,        KEY_EN_MEDIA_VOLUME_UP,     KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Vol Up
+        {   0,      0,       4,           4,        "Mic On / Off",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Mic On / Off
+        {   0,      0,       5,           5,        "Hyperfan",                 KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Hyperfan
+        {   0,      0,       6,           6,        "Armoury Crate",            KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Armoury Crate
     }
 };
 
@@ -131,13 +131,13 @@ keyboard_keymap_overlay_values g533zw_lid_layout
         }
     },
     {
-    /*---------------------------------------------------------------------------------------------------------*\
-    | Edit Keys                                                                                                 |
-    |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
-    \*---------------------------------------------------------------------------------------------------------*/
-        {   0,      0,       0,         167,        "Logo",                     KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L1
-        {   0,      0,       1,         176,        "Vertical Cut Left",        KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L2
-        {   0,      0,       2,         177,        "Vertical Cut Right",       KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L3
+        /*-------------------------------------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                                             |
+        |   Zone,   Row,    Column,     Value,      Key,                        Alternate Name,             OpCode,                             |
+        \*-------------------------------------------------------------------------------------------------------------------------------------*/
+        {   0,      0,       0,         167,        "Logo",                     KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L1
+        {   0,      0,       1,         176,        "Vertical Cut Left",        KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L2
+        {   0,      0,       2,         177,        "Vertical Cut Right",       KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L3
     }
 };
 
@@ -151,16 +151,16 @@ keyboard_keymap_overlay_values g533zw_lightbar_layout
         }
     },
     {
-    /*---------------------------------------------------------------------------------------------------------*\
-    | 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
+        /*-------------------------------------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                                             |
+        |   Zone,   Row,    Column,     Value,      Key,                        Alternate Name,             OpCode,                             |
+        \*-------------------------------------------------------------------------------------------------------------------------------------*/
+        {   0,      0,       0,         174,        "Lightbar L1",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L1
+        {   0,      0,       1,         173,        "Lightbar L2",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L2
+        {   0,      0,       2,         172,        "Lightbar L3",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L3
+        {   0,      0,       3,         171,        "Lightbar R3",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar R3
+        {   0,      0,       4,         170,        "Lightbar R2",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar R2
+        {   0,      0,       5,         169,        "Lightbar R1",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar R1
     }
 };
 
@@ -174,55 +174,55 @@ keyboard_keymap_overlay_values g713rw_keyboard_layout
         }
     },
     {
-        /*---------------------------------------------------------------------------------------------------------*\
-        | 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
+        /*-------------------------------------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                                             |
+        |   Zone,   Row,    Column,     Value,      Key,                        Alternate Name,             OpCode,                             |
+        \*-------------------------------------------------------------------------------------------------------------------------------------*/
+        {   0,      0,       2,           2,        KEY_EN_MEDIA_VOLUME_DOWN,   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_ROW,         },  // Insert Row and add Volume Down
+        {   0,      0,       3,           3,        KEY_EN_MEDIA_VOLUME_UP,     KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Volume Up
+        {   0,      0,       4,           4,        KEY_EN_MEDIA_MUTE,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Mute
+        {   0,      0,       5,           5,        "Key: Fan",                 KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert "Fan" key
+        {   0,      0,       6,           6,        "Key: ROG",                 KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert "ROG" key
+        {   0,      6,       1,         127,        KEY_EN_LEFT_FUNCTION,       KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Left Fuction
+        {   0,      6,       8,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove part of Spacebar
+        {   0,      6,       8,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove part of Spacebar
+        {   0,      6,      10,         136,        KEY_EN_RIGHT_FUNCTION,      KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove Right Fuction
+        {   0,      6,      10,         136,        KEY_EN_RIGHT_WINDOWS,       KEY_EN_UNUSED,              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,      1,      14,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
+        {   0,      1,      15,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // trim extra column before numpad
+        {   0,      1,      15,          38,        KEY_EN_DELETE,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert a Delete key
+        {   0,      1,      17,          40,        KEY_EN_PRINT_SCREEN,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert a Print Screen key
+        {   0,      1,      18,          41,        KEY_EN_HOME,                KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert a Home key
+        {   0,      2,      14,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      2,      14,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      3,      13,          76,        KEY_EN_ANSI_BACK_SLASH,     KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          }, // Force ANSI | even on ISO layouts
+        {   0,      3,      14,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      3,      14,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      4,      14,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      4,      14,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      5,      12,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // gap before arrow up key
+        {   0,      5,      13,           0,        KEY_EN_UNUSED,              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 .
+        {   0,      6,      11,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // 1 empty key before arrow keys
+        {   0,      6,      15,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // trim extra column before numpad
+        {   0,      6,      16,           0,        KEY_EN_UNUSED,              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,  },
+        {   0,      1,      14,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      2,      14,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      3,      14,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      4,      14,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      5,      14,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+        {   0,      6,      14,           0,        KEY_EN_UNUSED,              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, },
+        {   0,      5,      13,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },  // Remove Arrow Up
+        {   0,      6,      13,           0,        KEY_EN_UNUSED,              KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },  // Remove Arrow Down
+        {   0,      6,      12,         139,        KEY_EN_UP_ARROW,            KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },  // Shift Arrow Up
+        {   0,      7,      11,         159,        KEY_EN_LEFT_ARROW,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      7,      12,         160,        KEY_EN_DOWN_ARROW,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      7,      13,         161,        KEY_EN_RIGHT_ARROW,         KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
     }
 };
 
@@ -236,16 +236,109 @@ keyboard_keymap_overlay_values g713rw_lightbar_layout
         }
     },
     {
-        /*---------------------------------------------------------------------------------------------------------*\
-        | 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
+        /*-------------------------------------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                                             |
+        |   Zone,   Row,    Column,     Value,      Key,                        Alternate Name,             OpCode,                             |
+        \*-------------------------------------------------------------------------------------------------------------------------------------*/
+        {   0,      0,       0,         174,        "Lightbar L1",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L1
+        {   0,      0,       1,         173,        "Lightbar L2",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L2
+        {   0,      0,       2,         172,        "Lightbar L3",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L3
+        {   0,      0,       3,         171,        "Lightbar R3",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar R3
+        {   0,      0,       4,         170,        "Lightbar R2",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar R2
+        {   0,      0,       5,         169,        "Lightbar R1",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar R1
+    }
+};
+
+keyboard_keymap_overlay_values g713rw_test_layout
+{
+    KEYBOARD_SIZE_EMPTY,
+    {
+        {   /* Values not set in empty keyboard */   },
+        {
+            /* Add more regional layout fixes here */
+        }
+    },
+    {
+        /*-------------------------------------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                                             |
+        |   Zone,   Row,    Column,     Value,      Key,                        Alternate Name,             OpCode,                             |
+        \*-------------------------------------------------------------------------------------------------------------------------------------*/
+        {   0,      0,       0,           7,        "Test01",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,       1,           8,        "Test02",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,       2,           9,        "Test03",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,       3,          10,        "Test04",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,       4,          11,        "Test05",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,       5,          12,        "Test06",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,       6,          13,        "Test07",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,       7,          14,        "Test08",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,       8,          15,        "Test09",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,       9,          16,        "Test10",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      10,          17,        "Test11",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      11,          18,        "Test12",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      12,          19,        "Test13",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      13,          20,        "Test14",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      14,          22,        "Test15",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      15,          27,        "Test16",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      16,          55,        "Test17",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      17,          57,        "Test18",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      18,          58,        "Test19",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      19,          77,        "Test20",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      20,          78,        "Test21",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      21,          79,        "Test22",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      22,          96,        "Test23",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      23,          97,        "Test24",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      24,          99,        "Test25",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      25,         100,        "Test26",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      26,         104,        "Test27",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      27,         117,        "Test28",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      28,         118,        "Test29",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      29,         120,        "Test30",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      30,         121,        "Test31",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      31,         130,        "Test32",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      32,         132,        "Test33",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      33,         133,        "Test34",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      34,         134,        "Test35",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      35,         138,        "Test36",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      36,         140,        "Test37",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      37,         141,        "Test38",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      38,         142,        "Test39",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      39,         143,        "Test40",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      40,         146,        "Test41",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      41,         147,        "Test42",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      42,         148,        "Test43",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      43,         149,        "Test44",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      44,         150,        "Test45",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      45,         151,        "Test46",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      46,         152,        "Test47",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      47,         153,        "Test48",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      48,         154,        "Test49",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      49,         155,        "Test50",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      50,         156,        "Test51",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      51,         157,        "Test52",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      52,         158,        "Test53",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      53,         162,        "Test54",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      54,         163,        "Test55",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      55,         164,        "Test56",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      56,         165,        "Test57",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      57,         166,        "Test58",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      58,         167,        "Test59",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+    }
+};
+
+keyboard_keymap_overlay_values g733zm_layout
+{
+    KEYBOARD_SIZE_FULL,
+    {
+        aura_core_laptop_17_values,
+        {
+            /* Add more regional layout fixes here */
+        }
+    },
+    {
+        /*-------------------------------------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                                             |
+        |   Zone,   Row,    Column,     Value,      Key,                        Alternate Name,             OpCode,                             |
+        \*-------------------------------------------------------------------------------------------------------------------------------------*/
     }
 };
 
@@ -259,38 +352,38 @@ keyboard_keymap_overlay_values g814jv_keyboard_layout
         }
     },
     {
-     /*---------------------------------------------------------------------------------------------------------*\
-    | 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,      10,         136,        KEY_EN_PRINT_SCREEN,        KEYBOARD_OPCODE_SWAP_ONLY,          },  // Replace Right Fuction with PrtSc
-     {   0,      6,      11,           0,        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,  },
+     /*------------------------------------------------------------------------------------------------------------------------------------*\
+    | Edit Keys                                                                                                                             |
+    |   Zone,   Row,    Column,     Value,      Key,                        Alternate Name,             OpCode,                             |
+    \*-------------------------------------------------------------------------------------------------------------------------------------*/
+     {   0,      0,       2,           2,        KEY_EN_MEDIA_VOLUME_DOWN,  KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_ROW,         },  // Insert Row and add Volume Down
+     {   0,      0,       3,           3,        KEY_EN_MEDIA_VOLUME_UP,    KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Volume Up
+     {   0,      0,       4,           4,        KEY_EN_MEDIA_MUTE,         KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Mute
+     {   0,      0,       5,           5,        "Key: Fan",                KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert "Fan" key
+     {   0,      0,       6,           6,        "Key: ROG",                KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert "ROG" key
+     {   0,      6,       8,           0,        KEY_EN_UNUSED,             KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove part of Spacebar
+     {   0,      6,       8,           0,        KEY_EN_UNUSED,             KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove part of Spacebar
+     {   0,      6,       1,         127,        KEY_EN_LEFT_FUNCTION,      KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Left Fuction
+     {   0,      6,      10,         136,        KEY_EN_PRINT_SCREEN,       KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },  // Replace Right Fuction with PrtSc
+     {   0,      6,      11,           0,        KEY_EN_RIGHT_WINDOWS,      KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },  // Remove Right Win Key
+     {   0,      1,      14,           0,        KEY_EN_UNUSED,             KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      1,      14,          38,        KEY_EN_DELETE,             KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },  // Insert a Delete key
+     {   0,      1,      16,          40,        KEY_EN_PRINT_SCREEN,       KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert a Print Screen key
+     {   0,      1,      17,          41,        KEY_EN_HOME,               KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert a Home key
+     {   0,      2,      14,           0,        KEY_EN_UNUSED,             KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      2,      14,           0,        KEY_EN_UNUSED,             KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      2,      14,           0,        KEY_EN_UNUSED,             KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      3,      13,          76,        KEY_EN_ANSI_BACK_SLASH,    KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          }, // Force ANSI | even on ISO layouts
+     {   0,      3,      14,           0,        KEY_EN_UNUSED,             KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      3,      14,           0,        KEY_EN_UNUSED,             KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  }, // Numpad gap
+     {   0,      3,      14,           0,        KEY_EN_UNUSED,             KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      4,      14,           0,        KEY_EN_UNUSED,             KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      4,      14,           0,        KEY_EN_UNUSED,             KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      4,      14,           0,        KEY_EN_UNUSED,             KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      5,      12,           0,        KEY_EN_UNUSED,             KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      5,      13,           0,        KEY_EN_UNUSED,             KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      5,      14,           0,        KEY_EN_UNUSED,             KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
+     {   0,      6,      15,           0,        KEY_EN_UNUSED,             KEY_EN_UNUSED,              KEYBOARD_OPCODE_REMOVE_SHIFT_LEFT,  },
      }
 };
 
@@ -304,14 +397,14 @@ keyboard_keymap_overlay_values g814jv_lightbar_layout
         }
     },
     {
-        /*---------------------------------------------------------------------------------------------------------*\
-        | 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
+        /*-------------------------------------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                                             |
+        |   Zone,   Row,    Column,     Value,      Key,                        Alternate Name,             OpCode,                             |
+        \*-------------------------------------------------------------------------------------------------------------------------------------*/
+        {   0,      0,       0,         173,        "Lightbar L1",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L1
+        {   0,      0,       1,         172,        "Lightbar L2",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar L2
+        {   0,      0,       2,         170,        "Lightbar R2",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar R2
+        {   0,      0,       3,         169,        "Lightbar R1",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lightbar R2
     }
 };
 

Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/RGBController_AsusAuraCoreLaptop.cpp

@@ -41,7 +41,7 @@ RGBController_AsusAuraCoreLaptop::RGBController_AsusAuraCoreLaptop(AsusAuraCoreL
 
     name                                    = aura_dev->dmi_name;
     vendor                                  = "Asus";
-    type                                    = DEVICE_TYPE_KEYBOARD;
+    type                                    = DEVICE_TYPE_LAPTOP;
     description                             = controller->GetDeviceDescription();
     serial                                  = controller->GetSerial();
     location                                = controller->GetLocation();

Controllers/AsusAuraGPUController/AsusAuraGPUControllerDetect.cpp

@@ -72,10 +72,11 @@ REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1050 Gaming OC",
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1050 Ti Gaming",             DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1050TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1050TI_4G_GAMING,         0x29);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1050 Ti Gaming OC",          DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1050TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1050TI_O4G_GAMING,        0x29);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1050 Ti Gaming OC",          DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1050TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1050TI_O4G_GAMING_2,      0x29);
-REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1060 Gaming",                DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1060_DEV,         ASUS_SUB_VEN,   ASUS_GTX1060_STRIX_6G_GAMING,               0x29);
-REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1060 Gaming",                DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1060_DEV,         ASUS_SUB_VEN,   ASUS_GTX1060_STRIX,                         0x29);
-REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1070 Gaming",                DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1070_DEV,         ASUS_SUB_VEN,   ASUS_GTX1070_STRIX_GAMING,                  0x29);
-REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1070 Gaming OC",             DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1070_DEV,         ASUS_SUB_VEN,   ASUS_GTX1070_STRIX_OC,                      0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1060 Gaming",                DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1060_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1060_6G_GAMING,           0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1060 Gaming",                DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1060_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1060,                     0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1070 Gaming",                DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1070_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1070_8G_GAMING,           0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1070 Gaming OC",             DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1070_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1070_O8G_GAMING,          0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1070 OC",                    DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1070_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1070_OC,                  0x29);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1070 Ti Gaming",             DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1070TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1070TI_8G_GAMING,         0x29);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1070 A8G Ti Gaming",         DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1070TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1070TI_A8G_GAMING,        0x29);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1080 Gaming OC",             DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1080_DEV,         ASUS_SUB_VEN,   ASUS_GTX1080_STRIX,                         0x29);
@@ -86,6 +87,7 @@ REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1080 Ti Gaming",
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1080 Ti Gaming",             DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1080TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1080TI_11G_GAMING,        0x29);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1080 Ti Gaming OC",          DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1080TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1080TI_O11G_GAMING,       0x29);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1080 Ti Gaming OC",          DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1080TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1080TI_O11G_GAMING_A02,   0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG Poseidon GeForce GTX 1080 Ti",                 DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1080TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_POSEIDON_GTX1080TI,                0x29);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1650 SUPER A4G Gaming",      DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1650S_DEV,        ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1650S_A4G_GAMING,         0x2A);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1650 SUPER Gaming OC",       DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1650S_DEV,        ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1650S_OC,                 0x2A);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce GTX 1660 SUPER Gaming OC",       DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_GTX1660S_DEV,        ASUS_SUB_VEN,   ASUS_ROG_STRIX_GTX1660S_O6G_GAMING,         0x2A);
@@ -95,12 +97,14 @@ REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2060 Gaming",
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2060 Gaming OC",             DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2060_TU106_DEV,   ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2060_O6G_GAMING,          0x2A);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2060 Gaming OC",             DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2060_TU106_DEV,   ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2060_O6G_GAMING_86D2,     0x2A);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2060 EVO Gaming",            DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2060_TU106_DEV,   ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2060_EVO_GAMING,          0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2060 EVO V2 Gaming",         DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2060_TU106_DEV,   ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2060_06G_EVO_V2_GAMING,   0x2A);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2060 EVO Gaming OC",         DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2060_TU104_DEV,   ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2060_O6G_EVO_GAMING,      0x2A);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2060 SUPER Gaming",          DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2060S_OC_DEV,     ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2060S_8G_GAMING,          0x2A);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2060 SUPER A8G EVO Gaming",  DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2060S_DEV,        ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2060S_A8G_EVO_GAMING,     0x2A);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2060 SUPER Gaming OC",       DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2060S_OC_DEV,     ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2060S_O8G_GAMING,         0x2A);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2060 SUPER Gaming",          DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2060S_DEV,        ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2060S_8G_GAMING_8702,     0x2A);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2060 SUPER A8G Gaming",      DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2060S_OC_DEV,     ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2060S_A8G_GAMING,         0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2060 SUPER A8G Gaming",      DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2060S_OC_DEV,     ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2060S_A8G_GAMING_86FD,    0x2A);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2070 A8G Gaming",            DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2070_OC_DEV,      ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2070_A8G_GAMING,          0x2A);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2070 Gaming OC",             DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2070_OC_DEV,      ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2070_O8G_GAMING,          0x2A);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2070 SUPER A8G Gaming",      DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2070S_DEV,        ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2070S_A8G_GAMING_86FF,    0x2A);
@@ -119,7 +123,7 @@ REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2080 Ti Gaming",
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2080 Ti Gaming",             DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2080TI_A_DEV,     ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2080TI_11G_GAMING_866C,   0x2A);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2080 Ti A11G Gaming",        DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2080TI_A_DEV,     ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2080TI_A11G_GAMING,       0x2A);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 2080 Ti Gaming OC",          DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX2080TI_A_DEV,     ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX2080TI_O11G_GAMING,       0x2A);
-REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 3060 Ti Gaming OC",                DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3060TI_LHR_DEV,   ASUS_SUB_VEN,   ASUS_TUF_RTX_3060_TI_O8G_OC,                0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 3060 Ti Gaming OC",                DetectAsusAuraGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3060TI_LHR_DEV,   ASUS_SUB_VEN,   ASUS_TUF_RTX_3060TI_O8G_OC,                 0x2A);
 
 /*-----------------------------------------*\
 |  AMD GPUs                                 |
@@ -128,6 +132,7 @@ REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 3060 Ti Gaming OC",
 REGISTER_I2C_PCI_DETECTOR("ASUS AREZ STRIX Radeon RX Vega 56 Gaming OC",           DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_VEGA10_DEV,             ASUS_SUB_VEN,   ASUS_AREZ_STRIX_VEGA56_08G_GAMING,          0x29);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX Radeon Vega 64",                         DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_VEGA10_DEV,             ASUS_SUB_VEN,   ASUS_VEGA64_STRIX,                          0x29);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX Radeon RX 470 Gaming OC",                DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_POLARIS_DEV,            ASUS_SUB_VEN,   ASUS_RX470_STRIX_O4G_GAMING,                0x29);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX Radeon RX 480 Gaming",                   DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_POLARIS_DEV,            ASUS_SUB_VEN,   ASUS_RX480_STRIX_GAMING,                    0x29);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX Radeon RX 480 Gaming OC",                DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_POLARIS_DEV,            ASUS_SUB_VEN,   ASUS_RX480_STRIX_GAMING_OC,                 0x29);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX Radeon RX 560 Gaming",                   DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_POLARIS11,              ASUS_SUB_VEN,   ASUS_RX560_STRIX_4G_GAMING,                 0x29);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX Radeon RX 560 Gaming",                   DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_POLARIS11,              ASUS_SUB_VEN,   ASUS_RX560_STRIX_4G_GAMING_04BE,            0x29);
@@ -137,6 +142,7 @@ REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX Radeon RX 580 Gaming OC",
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX Radeon RX 580 Gaming TOP",               DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_POLARIS_DEV,            ASUS_SUB_VEN,   ASUS_RX580_STRIX_GAMING_TOP,                0x29);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX Radeon RX 590 Gaming",                   DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_POLARIS_DEV,            ASUS_SUB_VEN,   ASUS_RX590_STRIX_GAMING,                    0x29);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX Radeon RX 5600 XT Gaming OC",            DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_NAVI10_DEV,             ASUS_SUB_VEN,   ASUS_RX5600XT_STRIX_O6G_GAMING,             0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX Radeon RX 5700 Gaming OC",               DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_NAVI10_DEV,             ASUS_SUB_VEN,   ASUS_RX5700_STRIX_GAMING_OC,                0x2A);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX Radeon RX 5700 XT Gaming OC",            DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_NAVI10_DEV,             ASUS_SUB_VEN,   ASUS_RX5700XT_STRIX_GAMING_OC,              0x2A);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX Radeon RX 5700 XT Gaming OC",            DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_NAVI10_DEV,             ASUS_SUB_VEN,   ASUS_RX5700XT_STRIX_O8G_GAMING,             0x2A);
-REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX Radeon RX 5700 XT Gaming OC",            DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_NAVI10_DEV,             ASUS_SUB_VEN,   ASUS_RX5700XT_STRIX_O8G_GAMING_05C3,        0x2A);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX Radeon RX 5700 XT Gaming OC",            DetectAsusAuraGPUControllers,   AMD_GPU_VEN,    AMD_NAVI10_DEV,             ASUS_SUB_VEN,   ASUS_RX5700XT_STRIX_O8G_GAMING_05C3,        0x2A);

Controllers/AsusAuraUSBController/AsusAuraMonitorController/RGBController_AsusAuraMonitor.cpp

@@ -28,7 +28,7 @@ RGBController_AuraMonitor::RGBController_AuraMonitor(AuraMonitorController* cont
 
     name        = "ASUS Aura Monitor";
     vendor      = "ASUS";
-    type        = DEVICE_TYPE_ACCESSORY;
+    type        = DEVICE_TYPE_MONITOR;
     description = "ASUS Aura Monitor Device";
     location    = controller->GetDeviceLocation();
     serial      = controller->GetSerialString();

Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController/AsusAuraTUFKeyboardController.cpp

@@ -39,36 +39,29 @@ std::string AuraTUFKeyboardController::GetDeviceLocation()
     return("HID: " + location);
 }
 
-std::string clean_serial(const std::wstring& wstr)
+std::string AuraTUFKeyboardController::GetSerialString()
 {
+    wchar_t serial_string[HID_MAX_STR];
+    memset(serial_string, 0, sizeof(serial_string));
+
+    int ret = hid_get_serial_number_string(dev, serial_string, HID_MAX_STR);
+    if(ret != 0)
+    {
+        return("");
+    }
+
     /*-------------------------------------------------------------------------*\
     | Skip non-ASCII, trailing garbage in serial numbers. Required by the       |
     | Scope II 96, whose original firmware outputs garbage, which even differs  |
     | after computer reboots and therefore breaks OpenRGB profile matching.     |
     \*-------------------------------------------------------------------------*/
-    std::string result;
-    for(wchar_t c : wstr)
+    switch(device_pid)
     {
-        // Forbid control chars and anything above final printable low-ASCII.
-        if(c < 32 || c > 126)
-        {
+        case AURA_ROG_STRIX_SCOPE_II_96_WIRELESS_USB_PID:
+            serial_string[12] = L'\0';
+            break;
+        default:
             break;
-        }
-
-        result += (char)c;
-    }
-
-    return(result);
-}
-
-std::string AuraTUFKeyboardController::GetSerialString()
-{
-    wchar_t serial_string[128];
-    int ret = hid_get_serial_number_string(dev, serial_string, 128);
-
-    if(ret != 0)
-    {
-        return("");
     }
 
     return(StringUtils::wstring_to_string(serial_string));

Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController/AsusAuraTUFKeyboardController.h

@@ -17,6 +17,8 @@
 #include "RGBController.h"
 #include "AsusAuraTUFKeyboardLayouts.h"
 
+#define HID_MAX_STR 128
+
 enum
 {
     AURA_KEYBOARD_MODE_STATIC       =  0,
@@ -46,6 +48,7 @@ enum
     AURA_ROG_STRIX_FLARE_II_ANIMATE_PID                 = 0x19FC,
     AURA_ROG_STRIX_SCOPE_PID                            = 0x18F8,
     AURA_ROG_STRIX_SCOPE_RX_PID                         = 0x1951,
+    AURA_ROG_STRIX_SCOPE_RX_EVA_02_PID                  = 0x1B12,
     AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_USB_PID     = 0x19F6,
     AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_2_4_PID     = 0x19F8,
     AURA_ROG_STRIX_SCOPE_II_PID                         = 0x1AB3,

Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController/RGBController_AsusAuraTUFKeyboard.cpp

@@ -67,6 +67,7 @@ RGBController_AuraTUFKeyboard::RGBController_AuraTUFKeyboard(AuraTUFKeyboardCont
             case AURA_ROG_STRIX_FLARE_II_PID:
             case AURA_ROG_STRIX_FLARE_II_ANIMATE_PID:
             case AURA_ROG_STRIX_SCOPE_RX_PID:
+            case AURA_ROG_STRIX_SCOPE_RX_EVA_02_PID:
             case AURA_ROG_STRIX_SCOPE_PID:
             case AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_2_4_PID:
             case AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_USB_PID:
@@ -419,6 +420,7 @@ void RGBController_AuraTUFKeyboard::SetupZones()
             break;
         case AURA_ROG_STRIX_SCOPE_PID:
         case AURA_ROG_STRIX_SCOPE_RX_PID:
+        case AURA_ROG_STRIX_SCOPE_RX_EVA_02_PID:
         case AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_USB_PID:
         case AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_2_4_PID:
             keyboard_ptr = &AsusROGStrixScopeLayouts;

Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp

@@ -68,6 +68,7 @@
 #define AURA_ROG_STRIX_SCOPE_TKL_PID                        0x190C
 #define AURA_ROG_STRIX_SCOPE_TKL_PNK_LTD_PID                0x1954
 #define AURA_ROG_STRIX_SCOPE_RX_PID                         0x1951
+#define AURA_ROG_STRIX_SCOPE_RX_EVA_02_PID                  0x1B12
 #define AURA_ROG_STRIX_SCOPE_RX_TKL_DELUXE_PID              0x1A05
 #define AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_USB_PID     0x19F6
 #define AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_2_4_PID     0x19F8
@@ -119,6 +120,7 @@
 #define ROG_STRIX_LC120_PID                           0x879E
 #define AURA_RYUO_AIO_PID                             0x1887
 #define ASUS_ROG_ALLY_PID                             0x1ABE
+#define ASUS_ROG_ALLY_X_PID                           0x1B4C
 
 AuraKeyboardMappingLayoutType GetKeyboardMappingLayoutType(int pid)
 {
@@ -364,6 +366,7 @@ REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Flare II Animate",                 Dete
 REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Flare II",                         DetectAsusAuraTUFUSBKeyboard,   AURA_USB_VID, AURA_ROG_STRIX_FLARE_II_PID,                      1,  0xFF00);
 REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope",                            DetectAsusAuraTUFUSBKeyboard,   AURA_USB_VID, AURA_ROG_STRIX_SCOPE_PID,                         1,  0xFF00);
 REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope RX",                         DetectAsusAuraTUFUSBKeyboard,   AURA_USB_VID, AURA_ROG_STRIX_SCOPE_RX_PID,                      1,  0xFF00);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope RX EVA-02 Edition",          DetectAsusAuraTUFUSBKeyboard,   AURA_USB_VID, AURA_ROG_STRIX_SCOPE_RX_EVA_02_PID,               1,  0xFF00);
 REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope NX Wireless Deluxe USB",     DetectAsusAuraTUFUSBKeyboard,   AURA_USB_VID, AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_USB_PID,  1,  0xFF00);
 REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope NX Wireless Deluxe 2.4GHz",  DetectAsusAuraTUFUSBKeyboard,   AURA_USB_VID, AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_2_4_PID,  1,  0xFF00);
 REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope II",                         DetectAsusAuraTUFUSBKeyboard,   AURA_USB_VID, AURA_ROG_STRIX_SCOPE_II_PID,                      1,  0xFF00);
@@ -449,3 +452,4 @@ REGISTER_HID_DETECTOR_I  ("ASUS ROG Throne",                            DetectAs
 REGISTER_HID_DETECTOR_I  ("ASUS ROG Throne QI",                         DetectAsusAuraUSBHeadsetStand,  AURA_USB_VID, AURA_ROG_THRONE_QI_PID,                       0);
 REGISTER_HID_DETECTOR_I  ("ASUS ROG Throne QI GUNDAM",                  DetectAsusAuraUSBHeadsetStand,  AURA_USB_VID, AURA_ROG_THRONE_QI_GUNDAM_PID,                0);
 REGISTER_HID_DETECTOR_IPU("ASUS ROG Ally",                              DetectAsusROGAlly,              AURA_USB_VID, ASUS_ROG_ALLY_PID,                            2,  0xFF31, 0x0076);
+REGISTER_HID_DETECTOR_IPU("ASUS ROG Ally X",                            DetectAsusROGAlly,              AURA_USB_VID, ASUS_ROG_ALLY_X_PID,                          2,  0xFF31, 0x0076);

Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptop_Linux.cpp

@@ -27,9 +27,9 @@ RGBController_AsusTUFLaptopLinux::RGBController_AsusTUFLaptopLinux(AsusTUFLaptop
 {
     controller                      = controller_ptr;
 
-    name                            = "ASUS TUF Keyboard";
+    name                            = "ASUS TUF Laptop Keyboard";
     vendor                          = "ASUS";
-    type                            = DEVICE_TYPE_KEYBOARD;
+    type                            = DEVICE_TYPE_LAPTOP;
     description                     = "Asus TUF Device";
     location                        = ASUS_KBD_BACKLIGHT_BASE_PATH;
 

Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptop_Windows.cpp

@@ -24,9 +24,9 @@ using namespace std::chrono_literals;
 
 RGBController_AsusTUFLaptopWMI::RGBController_AsusTUFLaptopWMI(AsusTUFLaptopController* controller_ptr)
 {
-    name                        = "ASUS TUF Keyboard";
+    name                        = "ASUS TUF Laptop Keyboard";
     vendor                      = "ASUS";
-    type                        = DEVICE_TYPE_KEYBOARD;
+    type                        = DEVICE_TYPE_LAPTOP;
     description                 = "WMI Device";
     location                    = "\\\\.\\ATKACPI";
 

Controllers/CherryKeyboardController/CherryKeyboardController.h

@@ -30,20 +30,23 @@
 #define MX_BOARD_8_0_TKL_RGB_PID        0x00B7
 #define MX_BOARD_10_0_FL_RGB_PID        0x00BB
 #define G80_3000_TKL_NBL_PID            0x00C3
-#define MX_BOARD_2_0S_FL_RGB_PID        0x00C4
+#define MX_BOARD_2_0S_FL_RGB_EU_PID     0x01A6
+#define MX_BOARD_2_0S_FL_RGB_US_PID     0x00C4
+#define MX_BOARD_2_0S_FL_NBL_PID        0x00CE
 #define G80_3000_TKL_RGB_PID            0x00C5
 #define MV_BOARD_3_0FL_RGB_PID          0x00C7
 #define CCF_MX_8_0_TKL_BL_PID           0x00C9
 #define CCF_MX_1_0_TKL_BL_PID           0x00CA
 #define CCF_MX_1_0_TKL_NBL_PID          0x00CB
 #define G80_3000_TKL_NBL_KOR_PID        0x00CD
-#define MX_BOARD_2_0S_FL_NBL_PID        0x00CE
 #define MX_1_0_FL_NBL_PID               0x00D2
 #define MX_1_0_FL_RGB_PID               0x00D3
-#define G80_3000N_TKL_RGB_PID           0x00DD
-#define G80_3000N_FL_RGB_PID            0x00DE
-#define MX_BOARD_10_0N_FL_RGB_PID       0x00DF
-#define MX_BOARD_2_0S_FL_RGB_DE_PID     0x01A6
+#define G80_3000N_TKL_RGB_EU_PID        0x00DD
+#define G80_3000N_TKL_RGB_US_PID        0x00E0
+#define G80_3000N_FL_RGB_EU_PID         0x00DE
+#define G80_3000N_FL_RGB_US_PID         0x00E1
+#define MX_BOARD_10_0N_FL_RGB_EU_PID    0x00DF
+#define MX_BOARD_10_0N_FL_RGB_US_PID    0x00E2
 
 
 enum

Controllers/CherryKeyboardController/CherryKeyboardControllerDetect.cpp

@@ -51,17 +51,20 @@ REGISTER_HID_DETECTOR_IP("Cherry Keyboard MX BOARD 1.0 TKL RGB",        DetectCh
 REGISTER_HID_DETECTOR_IP("Cherry Keyboard MX BOARD 8.0 TKL RGB",        DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   MX_BOARD_8_0_TKL_RGB_PID    , 1, CHERRY_KEYBOARD_USAGE_PAGE);
 REGISTER_HID_DETECTOR_IP("Cherry Keyboard MX BOARD 10.0 FL RGB",        DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   MX_BOARD_10_0_FL_RGB_PID    , 1, CHERRY_KEYBOARD_USAGE_PAGE);
 REGISTER_HID_DETECTOR_IP("Cherry Keyboard G80-3000 TKL NBL",            DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   G80_3000_TKL_NBL_PID        , 1, CHERRY_KEYBOARD_USAGE_PAGE);
-REGISTER_HID_DETECTOR_IP("Cherry Keyboard MX BOARD 2.0S FL RGB",        DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   MX_BOARD_2_0S_FL_RGB_PID    , 1, CHERRY_KEYBOARD_USAGE_PAGE);
+REGISTER_HID_DETECTOR_IP("Cherry Keyboard MX BOARD 2.0S FL RGB (EU)",   DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   MX_BOARD_2_0S_FL_RGB_EU_PID , 1, CHERRY_KEYBOARD_USAGE_PAGE);
+REGISTER_HID_DETECTOR_IP("Cherry Keyboard MX BOARD 2.0S FL RGB (US)",   DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   MX_BOARD_2_0S_FL_RGB_US_PID , 1, CHERRY_KEYBOARD_USAGE_PAGE);
+REGISTER_HID_DETECTOR_IP("Cherry Keyboard MX BOARD 2.0S FL NBL",        DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   MX_BOARD_2_0S_FL_NBL_PID    , 1, CHERRY_KEYBOARD_USAGE_PAGE);
 REGISTER_HID_DETECTOR_IP("Cherry Keyboard G80-3000 TKL RGB",            DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   G80_3000_TKL_RGB_PID        , 1, CHERRY_KEYBOARD_USAGE_PAGE);
 REGISTER_HID_DETECTOR_IP("Cherry Keyboard MV BOARD 3.0 FL RGB",         DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   MV_BOARD_3_0FL_RGB_PID      , 1, CHERRY_KEYBOARD_USAGE_PAGE);
 REGISTER_HID_DETECTOR_IP("Cherry Keyboard CCF MX 8.0 TKL BL",           DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   CCF_MX_8_0_TKL_BL_PID       , 1, CHERRY_KEYBOARD_USAGE_PAGE);
 REGISTER_HID_DETECTOR_IP("Cherry Keyboard CCF MX 1.0 TKL BL",           DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   CCF_MX_1_0_TKL_BL_PID       , 1, CHERRY_KEYBOARD_USAGE_PAGE);
 REGISTER_HID_DETECTOR_IP("Cherry Keyboard CCF MX 1.0 TKL NBL",          DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   CCF_MX_1_0_TKL_NBL_PID      , 1, CHERRY_KEYBOARD_USAGE_PAGE);
 REGISTER_HID_DETECTOR_IP("Cherry Keyboard G80-3000 TKL NBL KOREAN",     DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   G80_3000_TKL_NBL_KOR_PID    , 1, CHERRY_KEYBOARD_USAGE_PAGE);
-REGISTER_HID_DETECTOR_IP("Cherry Keyboard MX BOARD 2.0S FL NBL",        DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   MX_BOARD_2_0S_FL_NBL_PID    , 1, CHERRY_KEYBOARD_USAGE_PAGE);
 REGISTER_HID_DETECTOR_IP("Cherry Keyboard MX 1.0 FL NBL",               DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   MX_1_0_FL_NBL_PID           , 1, CHERRY_KEYBOARD_USAGE_PAGE);
 REGISTER_HID_DETECTOR_IP("Cherry Keyboard MX 1.0 FL RGB",               DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   MX_1_0_FL_RGB_PID           , 1, CHERRY_KEYBOARD_USAGE_PAGE);
-REGISTER_HID_DETECTOR_IP("Cherry Keyboard G80-3000N TKL RGB",           DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   G80_3000N_TKL_RGB_PID       , 1, CHERRY_KEYBOARD_USAGE_PAGE);
-REGISTER_HID_DETECTOR_IP("Cherry Keyboard G80-3000N FL RGB",            DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   G80_3000N_FL_RGB_PID        , 1, CHERRY_KEYBOARD_USAGE_PAGE);
-REGISTER_HID_DETECTOR_IP("Cherry Keyboard MX BOARD 10.0N FL RGB",       DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   MX_BOARD_10_0N_FL_RGB_PID   , 1, CHERRY_KEYBOARD_USAGE_PAGE);
-REGISTER_HID_DETECTOR_IP("Cherry Keyboard MX BOARD 2.0S FL RGB DE",     DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   MX_BOARD_2_0S_FL_RGB_DE_PID , 1, CHERRY_KEYBOARD_USAGE_PAGE);
+REGISTER_HID_DETECTOR_IP("Cherry Keyboard G80-3000N TKL RGB (EU)",      DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   G80_3000N_TKL_RGB_EU_PID    , 1, CHERRY_KEYBOARD_USAGE_PAGE);
+REGISTER_HID_DETECTOR_IP("Cherry Keyboard G80-3000N TKL RGB (US)",      DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   G80_3000N_TKL_RGB_US_PID    , 1, CHERRY_KEYBOARD_USAGE_PAGE);
+REGISTER_HID_DETECTOR_IP("Cherry Keyboard G80-3000N FL RGB (EU)",       DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   G80_3000N_FL_RGB_EU_PID     , 1, CHERRY_KEYBOARD_USAGE_PAGE);
+REGISTER_HID_DETECTOR_IP("Cherry Keyboard G80-3000N FL RGB (US)",       DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   G80_3000N_FL_RGB_US_PID     , 1, CHERRY_KEYBOARD_USAGE_PAGE);
+REGISTER_HID_DETECTOR_IP("Cherry Keyboard MX BOARD 10.0N FL RGB (EU)",  DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   MX_BOARD_10_0N_FL_RGB_EU_PID, 1, CHERRY_KEYBOARD_USAGE_PAGE);
+REGISTER_HID_DETECTOR_IP("Cherry Keyboard MX BOARD 10.0N FL RGB (US)",  DetectCherryKeyboards, CHERRY_KEYBOARD_VID,   MX_BOARD_10_0N_FL_RGB_US_PID, 1, CHERRY_KEYBOARD_USAGE_PAGE);

Controllers/CherryKeyboardController/RGBController_CherryKeyboard.cpp

@@ -440,9 +440,9 @@ bool RGBController_CherryKeyboard::hasUnofficialModeSupport(const uint16_t produ
     // RGB keyboards known for not supporting unofficial modes
     case MX_BOARD_3_0S_FL_RGB_PID:
     case MX_BOARD_3_0S_FL_RGB_KOR_PID:
-    case MX_BOARD_2_0S_FL_RGB_PID:
+    case MX_BOARD_2_0S_FL_RGB_US_PID:
     case MX_BOARD_2_0S_FL_NBL_PID:
-    case MX_BOARD_2_0S_FL_RGB_DE_PID:
+    case MX_BOARD_2_0S_FL_RGB_EU_PID:
     case MV_BOARD_3_0FL_RGB_PID:
         return false;
     // RGB keyboards which (probably) support unofficial modes
@@ -451,9 +451,12 @@ bool RGBController_CherryKeyboard::hasUnofficialModeSupport(const uint16_t produ
     case MX_BOARD_10_0_FL_RGB_PID: // unknown (probably yes, related to 10.0N)
     case G80_3000_TKL_RGB_PID: // unknown
     case MX_1_0_FL_RGB_PID: // unkown
-    case G80_3000N_TKL_RGB_PID: // yes
-    case G80_3000N_FL_RGB_PID: // firmware v0102: YES, firmware v0103: NO
-    case MX_BOARD_10_0N_FL_RGB_PID: // yes
+    case G80_3000N_TKL_RGB_EU_PID: // yes
+    case G80_3000N_TKL_RGB_US_PID: // yes
+    case G80_3000N_FL_RGB_EU_PID: // firmware v0102: YES, firmware v0103: NO
+    case G80_3000N_FL_RGB_US_PID: // firmware v0102: YES, firmware v0103: NO
+    case MX_BOARD_10_0N_FL_RGB_EU_PID: // yes
+    case MX_BOARD_10_0N_FL_RGB_US_PID: // yes
     default:
         return true;
     }

Controllers/ColorfulGPUController/ColorfulGPUControllerDetect.cpp

@@ -51,21 +51,23 @@ REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3060 Ultra W OC 12G L-V",     Detec
 REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3060 Ultra W OC 12G L-V",     DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3060_LHR_DEV,      COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_3060_ULTRAW_OC_12G_2,        0x61);
 REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3060 Ti Ultra W OC LHR-V",    DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3060TI_LHR_DEV,    COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_3060_ULTRAW_OC_12G_2,        0x61);
 REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3060 Ti Advanced OC-V",       DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3060TI_LHR_DEV,    COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_3070_ADVANCED_OCV,           0x61);
-REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3060 Ti Advanced OC-V",       DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3060TI_LHR_DEV,    COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_3060_TI_ADVANCED_OC,         0x61);
+REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3060 Ti Advanced OC-V",       DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3060TI_LHR_DEV,    COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_3060TI_ADVANCED_OC,          0x61);
 REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3070 Advanced OC-V",          DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3070_DEV,          COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_3070_ADVANCED_OCV,           0x61);
 REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3070 Advanced OC-V",          DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3070_DEV,          COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_3070_ADVANCED_OCV2,          0x61);
 REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3070 Ultra W OC-V",           DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3070_DEV,          COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_3070_ULTRAW_OC,              0x61);
 REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3070 Ultra W OC LHR",         DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3070_LHR_DEV,      COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_3070_ULTRAW_OC,              0x61);
-REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3070 Ti Ultra W OC LHR",      DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3070TI_DEV,        COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_3070_TI_ULTRAW_OC,           0x61);
-REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3070 Ti Advanced OC-V",       DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3070TI_DEV,        COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_3070_TI_ADVANCED_OCV2,       0x61);
+REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3070 Ti Ultra W OC LHR",      DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3070TI_DEV,        COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_3070TI_ULTRAW_OC,            0x61);
+REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3070 Ti Advanced OC-V",       DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3070TI_DEV,        COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_3070TI_ADVANCED_OCV2,        0x61);
 REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3080 Advanced OC 10G-V",      DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3080_DEV,          COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_3080_ADVANCED_OC_10G,        0x61);
-REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3080 Ti Advanced OC-V",       DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3080TI_DEV,        COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_3080_TI_ADVANCED_OCV2,       0x61);
+REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3080 Ti Advanced OC-V",       DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3080TI_DEV,        COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_3080TI_ADVANCED_OCV2,        0x61);
 REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3080 Ultra W OC 10G LHR-V",   DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3080_LHR_DEV,      COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_3080_ULTRAW_OC_10G,          0x61);
 REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 3080 Ultra W OC 10G LHR-V",   DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3080_LHR_DEV,      COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_3080_ULTRAW_OC_10G_2,        0x61);
-REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 4070 Ti Advanced OC-V",       DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX4070TI_DEV,        COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_4070_TI_ADVANCED_OCV,        0x61);
-REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 4070 Ti SUPER Advanced OC-V", DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX4070TIS_AD102_DEV, COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_4070_TI_SUPER_ADVANCED_OCV2, 0x61);
-REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 4070 SUPER Ultra W OC 12GB",  DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX4070S_DEV,         COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_4070_SUPER_ULTRA_W_OC_12GB,  0x61);
+REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 4070 Ti Advanced OC-V",       DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX4070TI_DEV,        COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_4070TI_ADVANCED_OCV,         0x61);
+REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 4070 Ti SUPER Advanced OC-V", DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX4070TIS_AD102_DEV, COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_4070TI_SUPER_ADVANCED_OCV2,  0x61);
+REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 4070 Ti SUPER Ultra W",       DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX4070TIS_DEV,       COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_4070TI_SUPER_ULTRA_W,        0x61);
+REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 4070 SUPER Ultra W OC",       DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX4070S_DEV,         COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_4070_SUPER_ULTRA_W_OC,       0x61);
 REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 4070 Vulcan OC-V",            DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX4070_DEV,          COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_4070_VULCAN_OCV,             0x61);
+REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 4070 SUPER Ultra W OC-V",     DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX4070S_DEV,         COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_4070S_ULTRAW_OCV,            0x61);
 REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 4080 Ultra W OC-V",           DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX4080_DEV,          COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_4080_ULTRAW_OCV,             0x61);
 REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 4080 Ultra W OC-V",           DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX4080_DEV,          COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_4080_ULTRAW_OCV2,            0x61);
 REGISTER_I2C_PCI_DETECTOR("iGame GeForce RTX 4090 Advanced OC-V",          DetectColorfulGPUControllers,   NVIDIA_VEN, NVIDIA_RTX4090_DEV,          COLORFUL_SUB_VEN,   COLORFUL_IGAME_RTX_4090_ADVANCED_OCV,           0x61);

Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardDevices.cpp

@@ -280,7 +280,7 @@ keyboard_keymap_overlay_values mk_pro_s_layout
     {
         /*---------------------------------------------------------------------------------------------------------*\
         | Edit Keys                                                                                                 |
-        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
+        |   Zone,   Row,    Column,     Value,      Key,        Alternate Name,     OpCode,                         |
         \*---------------------------------------------------------------------------------------------------------*/
     },
 };
@@ -297,12 +297,12 @@ keyboard_keymap_overlay_values mk_pro_l_layout
     {
         /*---------------------------------------------------------------------------------------------------------*\
         | Edit Keys                                                                                                 |
-        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
+        |   Zone,   Row,    Column,     Value,      Name,       Alternate Name,     OpCode,                         |
         \*---------------------------------------------------------------------------------------------------------*/
-        {   0,      0,      17,         101,          "Key: P1",                  KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      18,         109,          "Key: P2",                  KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      19,         117,          "Key: P3",                  KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      20,         119,          "Key: P4",                  KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      17,         101,        "Key: P1",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      18,         109,        "Key: P2",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      19,         117,        "Key: P3",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      20,         119,        "Key: P4",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
     },
 };
 
@@ -322,16 +322,16 @@ keyboard_keymap_overlay_values mk850_layout
     {
         /*---------------------------------------------------------------------------------------------------------*\
         | Edit Keys                                                                                                 |
-        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
+        |   Zone,   Row,    Column,     Value,      Name,           Alternate Name,     OpCode,                     |
         \*---------------------------------------------------------------------------------------------------------*/
-        {   0,      0,      17,       146,          "Key: Aim <|>",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, // aimpad <|>
-        {   0,      0,      18,       153,          "Key: Aim -",               KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, // aimpad +
-        {   0,      0,      19,       160,          "Key: Aim +",               KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, // aimpad -
-        {   0,      1,       0,         0,          "Key: M5",                  KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      2,       0,         1,          "Key: M4",                  KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      3,       0,         2,          "Key: M3",                  KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      4,       0,         3,          "Key: M2",                  KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      5,       0,         4,          "Key: M1",                  KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      17,       146,          "Key: Aim <|>", KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, // aimpad <|>
+        {   0,      0,      18,       153,          "Key: Aim -",   KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, // aimpad +
+        {   0,      0,      19,       160,          "Key: Aim +",   KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, }, // aimpad -
+        {   0,      1,       0,         0,          "Key: M5",      KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      2,       0,         1,          "Key: M4",      KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      3,       0,         2,          "Key: M3",      KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      4,       0,         3,          "Key: M2",      KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      5,       0,         4,          "Key: M1",      KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
     },
 };
 
@@ -345,51 +345,51 @@ keyboard_keymap_overlay_values sk620_layout
         }
     },
     {
-        /*---------------------------------------------------------------------------------------------------------*\
-        | Edit Keys                                                                                                 |
-        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
-        \*---------------------------------------------------------------------------------------------------------*/
-        {   0,      0,      0,          7,         "Light: Top 1",              KEYBOARD_OPCODE_INSERT_ROW, },
-        {   0,      0,      1,         14,         "Light: Top 2",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      2,         21,         "Light: Top 3",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      3,         28,         "Light: Top 4",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      4,         35,         "Light: Top 5",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      5,         42,         "Light: Top 6",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      6,         49,         "Light: Top 7",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      7,         56,         "Light: Top 8",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      8,         63,         "Light: Top 9",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      9,         70,         "Light: Top 10",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      10,        77,         "Light: Top 11",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      11,        84,         "Light: Top 12",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      12,        91,         "Light: Top 13",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      13,        98,         "Light: Top 14",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      14,       105,         "Light: Top 14",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      1,      0,          0,         "Light: Left 1",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      2,      0,          1,         "Light: Left 2",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      3,      0,          2,         "Light: Left 3",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      4,      0,          3,         "Light: Left 4",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      5,      0,          4,         "Light: Left 5",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      1,      16,       112,         "Light: Right 1",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      2,      16,       113,         "Light: Right 2",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      3,      16,       114,         "Light: Right 3",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      4,      16,       115,         "Light: Right 4",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      5,      16,       116,         "Light: Right 5",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       0,         6,         "Light: Bottom 1",           KEYBOARD_OPCODE_INSERT_ROW, },
-        {   0,      6,       1,        20,         "Light: Bottom 2",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       2,        27,         "Light: Bottom 3",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       3,        34,         "Light: Bottom 4",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       4,        41,         "Light: Bottom 5",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       5,        48,         "Light: Bottom 6",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       6,        55,         "Light: Bottom 7",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       7,        62,         "Light: Bottom 8",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       8,        69,         "Light: Bottom 9",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       9,        76,         "Light: Bottom 10",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       10,       83,         "Light: Bottom 11",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       11,       90,         "Light: Bottom 12",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       12,       97,         "Light: Bottom 13",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       13,      104,         "Light: Bottom 14",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       14,      111,         "Light: Bottom 15",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       14,      118,         "Light: Bottom 16",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        /*-----------------------------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                                     |
+        |   Zone,   Row,    Column,     Value,      Key,                        Alternate Name,     OpCode,                             |
+        \*-----------------------------------------------------------------------------------------------------------------------------*/
+        {   0,      0,      0,          7,         "Light: Top 1",              KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_ROW,         },
+        {   0,      0,      1,         14,         "Light: Top 2",              KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      2,         21,         "Light: Top 3",              KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      3,         28,         "Light: Top 4",              KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      4,         35,         "Light: Top 5",              KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      5,         42,         "Light: Top 6",              KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      6,         49,         "Light: Top 7",              KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      7,         56,         "Light: Top 8",              KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      8,         63,         "Light: Top 9",              KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      9,         70,         "Light: Top 10",             KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      10,        77,         "Light: Top 11",             KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      11,        84,         "Light: Top 12",             KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      12,        91,         "Light: Top 13",             KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      13,        98,         "Light: Top 14",             KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      14,       105,         "Light: Top 14",             KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      1,      0,          0,         "Light: Left 1",             KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      2,      0,          1,         "Light: Left 2",             KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      3,      0,          2,         "Light: Left 3",             KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      4,      0,          3,         "Light: Left 4",             KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      5,      0,          4,         "Light: Left 5",             KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      1,      16,       112,         "Light: Right 1",            KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      2,      16,       113,         "Light: Right 2",            KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      3,      16,       114,         "Light: Right 3",            KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      4,      16,       115,         "Light: Right 4",            KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      5,      16,       116,         "Light: Right 5",            KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       0,         6,         "Light: Bottom 1",           KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_ROW,         },
+        {   0,      6,       1,        20,         "Light: Bottom 2",           KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       2,        27,         "Light: Bottom 3",           KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       3,        34,         "Light: Bottom 4",           KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       4,        41,         "Light: Bottom 5",           KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       5,        48,         "Light: Bottom 6",           KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       6,        55,         "Light: Bottom 7",           KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       7,        62,         "Light: Bottom 8",           KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       8,        69,         "Light: Bottom 9",           KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       9,        76,         "Light: Bottom 10",          KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       10,       83,         "Light: Bottom 11",          KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       11,       90,         "Light: Bottom 12",          KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       12,       97,         "Light: Bottom 13",          KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       13,      104,         "Light: Bottom 14",          KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       14,      111,         "Light: Bottom 15",          KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       14,      118,         "Light: Bottom 16",          KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
     },
 };
 
@@ -405,49 +405,49 @@ keyboard_keymap_overlay_values sk622_layout
     {
         /*---------------------------------------------------------------------------------------------------------*\
         | Edit Keys                                                                                                 |
-        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
+        |   Zone,   Row,    Column,     Value,      Name,               Alternate Name,     OpCode,                 |
         \*---------------------------------------------------------------------------------------------------------*/
-        {   0,      0,      0,          7,         "Light: Top 1",              KEYBOARD_OPCODE_INSERT_ROW, },
-        {   0,      0,      1,         14,         "Light: Top 2",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      2,         21,         "Light: Top 3",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      3,         28,         "Light: Top 4",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      4,         35,         "Light: Top 5",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      5,         42,         "Light: Top 6",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      6,         49,         "Light: Top 7",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      7,         56,         "Light: Top 8",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      8,         63,         "Light: Top 9",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      9,         70,         "Light: Top 10",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      10,        77,         "Light: Top 11",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      11,        84,         "Light: Top 12",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      12,        91,         "Light: Top 13",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      13,        98,         "Light: Top 14",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      14,       105,         "Light: Top 14",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      1,      0,          0,         "Light: Left 1",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      2,      0,          1,         "Light: Left 2",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      3,      0,          2,         "Light: Left 3",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      4,      0,          3,         "Light: Left 4",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      5,      0,          4,         "Light: Left 5",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      1,      16,       112,         "Light: Right 1",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      2,      16,       113,         "Light: Right 2",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      3,      16,       114,         "Light: Right 3",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      4,      16,       115,         "Light: Right 4",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      5,      16,       116,         "Light: Right 5",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       0,         6,         "Light: Bottom 1",           KEYBOARD_OPCODE_INSERT_ROW, },
-        {   0,      6,       1,        20,         "Light: Bottom 2",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       2,        27,         "Light: Bottom 3",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       3,        34,         "Light: Bottom 4",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       4,        41,         "Light: Bottom 5",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       5,        48,         "Light: Bottom 6",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       6,        55,         "Light: Bottom 7",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       7,        62,         "Light: Bottom 8",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       8,        69,         "Light: Bottom 9",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       9,        76,         "Light: Bottom 10",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       10,       83,         "Light: Bottom 11",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       11,       90,         "Light: Bottom 12",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       12,       97,         "Light: Bottom 13",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       13,      104,         "Light: Bottom 14",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       14,      111,         "Light: Bottom 15",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       14,      118,         "Light: Bottom 16",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      0,          7,          "Light: Top 1",     KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_ROW, },
+        {   0,      0,      1,         14,          "Light: Top 2",     KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      2,         21,          "Light: Top 3",     KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      3,         28,          "Light: Top 4",     KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      4,         35,          "Light: Top 5",     KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      5,         42,          "Light: Top 6",     KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      6,         49,          "Light: Top 7",     KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      7,         56,          "Light: Top 8",     KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      8,         63,          "Light: Top 9",     KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      9,         70,          "Light: Top 10",    KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      10,        77,          "Light: Top 11",    KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      11,        84,          "Light: Top 12",    KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      12,        91,          "Light: Top 13",    KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      13,        98,          "Light: Top 14",    KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      14,       105,          "Light: Top 14",    KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      1,      0,          0,          "Light: Left 1",    KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      2,      0,          1,          "Light: Left 2",    KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      3,      0,          2,          "Light: Left 3",    KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      4,      0,          3,          "Light: Left 4",    KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      5,      0,          4,          "Light: Left 5",    KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      1,      16,       112,          "Light: Right 1",   KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      2,      16,       113,          "Light: Right 2",   KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      3,      16,       114,          "Light: Right 3",   KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      4,      16,       115,          "Light: Right 4",   KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      5,      16,       116,          "Light: Right 5",   KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       0,         6,          "Light: Bottom 1",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_ROW, },
+        {   0,      6,       1,        20,          "Light: Bottom 2",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       2,        27,          "Light: Bottom 3",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       3,        34,          "Light: Bottom 4",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       4,        41,          "Light: Bottom 5",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       5,        48,          "Light: Bottom 6",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       6,        55,          "Light: Bottom 7",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       7,        62,          "Light: Bottom 8",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       8,        69,          "Light: Bottom 9",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       9,        76,          "Light: Bottom 10", KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       10,       83,          "Light: Bottom 11", KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       11,       90,          "Light: Bottom 12", KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       12,       97,          "Light: Bottom 13", KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       13,      104,          "Light: Bottom 14", KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       14,      111,          "Light: Bottom 15", KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       14,      118,          "Light: Bottom 16", KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
     },
 };
 
@@ -534,30 +534,30 @@ keyboard_keymap_overlay_values mk730_layout
     {
         /*---------------------------------------------------------------------------------------------------------*\
         | Edit Keys                                                                                                 |
-        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
+        |   Zone,   Row,    Column,     Value,      Name,               Alternate Name,     OpCode,                 |
         \*---------------------------------------------------------------------------------------------------------*/
-        {   0,      1,      0,          1,         "Light: Left 1",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      2,      0,          2,         "Light: Left 2",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      3,      0,          3,         "Light: Left 3",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      4,      0,          4,         "Light: Left 4",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      1,      18,       141,         "Light: Right 1",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      2,      18,       142,         "Light: Right 2",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      3,      18,       143,         "Light: Right 3",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      4,      18,       144,         "Light: Right 4",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       1,        13,         "Light: Bottom 1",           KEYBOARD_OPCODE_INSERT_ROW, },
-        {   0,      6,       2,        20,         "Light: Bottom 2",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       3,        27,         "Light: Bottom 3",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       4,        34,         "Light: Bottom 4",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       5,        41,         "Light: Bottom 5",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       6,        55,         "Light: Bottom 6",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       7,        62,         "Light: Bottom 7",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       8,        69,         "Light: Logo",               KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,      10,        76,         "Light: Bottom 8",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,      11,        90,         "Light: Bottom 9",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,      12,       104,         "Light: Bottom 10",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,      13,       111,         "Light: Bottom 11",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,      14,       118,         "Light: Bottom 12",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,      15,       125,         "Light: Bottom 13",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      1,      0,          1,          "Light: Left 1",    KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      2,      0,          2,          "Light: Left 2",    KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      3,      0,          3,          "Light: Left 3",    KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      4,      0,          4,          "Light: Left 4",    KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      1,      18,       141,          "Light: Right 1",   KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      2,      18,       142,          "Light: Right 2",   KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      3,      18,       143,          "Light: Right 3",   KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      4,      18,       144,          "Light: Right 4",   KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       1,        13,          "Light: Bottom 1",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_ROW, },
+        {   0,      6,       2,        20,          "Light: Bottom 2",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       3,        27,          "Light: Bottom 3",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       4,        34,          "Light: Bottom 4",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       5,        41,          "Light: Bottom 5",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       6,        55,          "Light: Bottom 6",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       7,        62,          "Light: Bottom 7",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       8,        69,          "Light: Logo",      KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,      10,        76,          "Light: Bottom 8",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,      11,        90,          "Light: Bottom 9",  KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,      12,       104,          "Light: Bottom 10", KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,      13,       111,          "Light: Bottom 11", KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,      14,       118,          "Light: Bottom 12", KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,      15,       125,          "Light: Bottom 13", KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
     }
 };
 
@@ -582,38 +582,38 @@ keyboard_keymap_overlay_values mk750_layout
     {
         /*---------------------------------------------------------------------------------------------------------*\
         | Edit Keys                                                                                                 |
-        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
+        |   Zone,   Row,    Column,     Value,      Name,                       Alternate Name,     OpCode,         |
         \*---------------------------------------------------------------------------------------------------------*/
-        {   0,      0,      17,       140,         KEY_EN_MEDIA_MUTE,           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      18,       147,         KEY_EN_MEDIA_PLAY_PAUSE,     KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      19,       154,         KEY_EN_MEDIA_PREVIOUS,       KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      20,       161,         KEY_EN_MEDIA_NEXT,           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      1,      0,          1,         "Light: Left 1",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      2,      0,          2,         "Light: Left 2",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      3,      0,          3,         "Light: Left 3",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      4,      0,          4,         "Light: Left 4",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      1,      22,       170,         "Light: Right 1",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      2,      22,       171,         "Light: Right 2",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      3,      22,       172,         "Light: Right 3",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      4,      22,       173,         "Light: Right 4",            KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       1,        20,         "Light: Bottom 1",           KEYBOARD_OPCODE_INSERT_ROW, },
-        {   0,      6,       2,        27,         "Light: Bottom 2",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       3,        34,         "Light: Bottom 3",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       4,        41,         "Light: Bottom 4",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       5,        55,         "Light: Bottom 5",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       6,        62,         "Light: Bottom 6",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       7,        69,         "Light: Bottom 7",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       8,        76,         "Light: Bottom 8",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,       9,        83,         "Light: Bottom 9",           KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,      10,        90,         "Light: Bottom 10",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,      11,       104,         "Light: Bottom 11",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,      12,       111,         "Light: Bottom 12",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,      13,       118,         "Light: Bottom 13",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,      14,       125,         "Light: Bottom 14",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,      15,       132,         "Light: Bottom 15",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,      16,       146,         "Light: Bottom 16",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,      17,       153,         "Light: Bottom 17",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,      18,       160,         "Light: Bottom 18",          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      17,       140,          KEY_EN_MEDIA_MUTE,          KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      18,       147,          KEY_EN_MEDIA_PLAY_PAUSE,    KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      19,       154,          KEY_EN_MEDIA_PREVIOUS,      KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      20,       161,          KEY_EN_MEDIA_NEXT,          KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      1,      0,          1,          "Light: Left 1",            KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      2,      0,          2,          "Light: Left 2",            KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      3,      0,          3,          "Light: Left 3",            KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      4,      0,          4,          "Light: Left 4",            KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      1,      22,       170,          "Light: Right 1",           KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      2,      22,       171,          "Light: Right 2",           KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      3,      22,       172,          "Light: Right 3",           KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      4,      22,       173,          "Light: Right 4",           KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       1,        20,          "Light: Bottom 1",          KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_ROW, },
+        {   0,      6,       2,        27,          "Light: Bottom 2",          KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       3,        34,          "Light: Bottom 3",          KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       4,        41,          "Light: Bottom 4",          KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       5,        55,          "Light: Bottom 5",          KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       6,        62,          "Light: Bottom 6",          KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       7,        69,          "Light: Bottom 7",          KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       8,        76,          "Light: Bottom 8",          KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,       9,        83,          "Light: Bottom 9",          KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,      10,        90,          "Light: Bottom 10",         KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,      11,       104,          "Light: Bottom 11",         KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,      12,       111,          "Light: Bottom 12",         KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,      13,       118,          "Light: Bottom 13",         KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,      14,       125,          "Light: Bottom 14",         KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,      15,       132,          "Light: Bottom 15",         KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,      16,       146,          "Light: Bottom 16",         KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,      17,       153,          "Light: Bottom 17",         KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,      18,       160,          "Light: Bottom 18",         KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
     }
 };
 
@@ -670,11 +670,11 @@ keyboard_keymap_overlay_values ck550v2_layout
     {
         /*---------------------------------------------------------------------------------------------------------*\
         | Edit Keys                                                                                                 |
-        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
+        |   Zone,   Row,    Column,     Value,      Name,           Alternate Name,     OpCode,                             |
         \*---------------------------------------------------------------------------------------------------------*/
-        {   0,      0,      17,        120,        "Indicator: N",                          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      18,        126,        "Indicator: C",                          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      19,        132,        "Indicator: S",                          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      17,        120,         "Indicator: N", KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      18,        126,         "Indicator: C", KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      19,        132,         "Indicator: S", KEY_EN_UNUSED,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
     },
 };
 

Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.cpp

@@ -29,7 +29,7 @@ RGBController_CMMonitorController::RGBController_CMMonitorController(CMMonitorCo
     controller                  = controller_ptr;
     name                        = "CoolerMaster LED Controller A1";
     vendor                      = "CoolerMaster";
-    type                        = DEVICE_TYPE_ACCESSORY;
+    type                        = DEVICE_TYPE_MONITOR;
     description                 = name;
     location                    = controller->GetDeviceLocation();
     serial                      = controller->GetSerialString();

Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.h

@@ -11,7 +11,6 @@
 
 #pragma once
 
-#include <vector>
 #include "RGBController.h"
 #include "CMMonitorController.h"
 

Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.cpp

@@ -10,6 +10,7 @@
 \*---------------------------------------------------------*/
 
 #include <cstring>
+#include <chrono>
 #include "CorsairDominatorPlatinumController.h"
 
 using namespace std::chrono_literals;

Controllers/CorsairHydroPlatinumController/CorsairHydroPlatinumControllerDetect.cpp

@@ -30,6 +30,7 @@
 #define CORSAIR_HYDRO_H100I_PRO_XT_V2_PID   0x0C2D
 #define CORSAIR_HYDRO_H115I_PRO_XT_PID      0x0C21
 #define CORSAIR_HYDRO_H150I_PRO_XT_PID      0x0C22
+#define CORSAIR_HYDRO_H100I_ELITE_PID       0x0C40
 
 void DetectCorsairHydroPlatinumControllers(hid_device_info* info, const std::string& name)
 {
@@ -52,3 +53,4 @@ REGISTER_HID_DETECTOR("Corsair Hydro H100i Pro XT",         DetectCorsairHydroPl
 REGISTER_HID_DETECTOR("Corsair Hydro H100i Pro XT v2",      DetectCorsairHydroPlatinumControllers, CORSAIR_VID, CORSAIR_HYDRO_H100I_PRO_XT_V2_PID   );
 REGISTER_HID_DETECTOR("Corsair Hydro H115i Pro XT",         DetectCorsairHydroPlatinumControllers, CORSAIR_VID, CORSAIR_HYDRO_H115I_PRO_XT_PID      );
 REGISTER_HID_DETECTOR("Corsair Hydro H150i Pro XT",         DetectCorsairHydroPlatinumControllers, CORSAIR_VID, CORSAIR_HYDRO_H150I_PRO_XT_PID      );
+REGISTER_HID_DETECTOR("Corsair Hydro H100i Elite",          DetectCorsairHydroPlatinumControllers, CORSAIR_VID, CORSAIR_HYDRO_H100I_ELITE_PID       );

Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp

@@ -58,10 +58,10 @@ keyboard_keymap_overlay_values corsair_K60_layout
         }
     },
     {
-        /*---------------------------------------------------------------------------------------------------------*\
-        | Edit Keys                                                                                                 |
-        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
-        \*---------------------------------------------------------------------------------------------------------*/
+        /*-------------------------------------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                                             |
+        |   Zone,   Row,    Column,     Value,      Name,                       Alternate Name,             OpCode                              |
+        \*-------------------------------------------------------------------------------------------------------------------------------------*/
     }
 };
 
@@ -75,10 +75,10 @@ keyboard_keymap_overlay_values corsair_K60_tkl_layout
         }
     },
     {
-        /*---------------------------------------------------------------------------------------------------------*\
-        | Edit Keys                                                                                                 |
-        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
-        \*---------------------------------------------------------------------------------------------------------*/
+        /*-------------------------------------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                                             |
+        |   Zone,   Row,    Column,     Value,      Name,                       Alternate Name,             OpCode                              |
+        \*-------------------------------------------------------------------------------------------------------------------------------------*/
     }
 };
 
@@ -92,10 +92,10 @@ keyboard_keymap_overlay_values corsair_k70_layout
         }
     },
     {
-        /*---------------------------------------------------------------------------------------------------------*\
-        | Edit Keys                                                                                                 |
-        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
-        \*---------------------------------------------------------------------------------------------------------*/
+        /*-------------------------------------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                                             |
+        |   Zone,   Row,    Column,     Value,      Name,                       Alternate Name,             OpCode                              |
+        \*-------------------------------------------------------------------------------------------------------------------------------------*/
     }
 };
 
@@ -109,19 +109,19 @@ keyboard_keymap_overlay_values corsair_k70_pro_layout
         }
     },
     {
-        /*---------------------------------------------------------------------------------------------------------*\
-        | Edit Keys                                                                                                 |
-        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
-        \*---------------------------------------------------------------------------------------------------------*/
-        {   0,      0,       0,         128,        "Profile",                  KEYBOARD_OPCODE_INSERT_ROW,         },  // Insert Profile into new row
-        {   0,      0,       1,         113,        "Light",                    KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Light key
-        {   0,      0,       2,         114,        "Lock",                     KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lock Key
-        {   0,      0,      10,         191,        "Logo",                     KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Logo
-        {   0,      0,      18,         102,        KEY_EN_MEDIA_MUTE,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Mute Key
-        {   0,      1,      17,         123,        KEY_EN_MEDIA_STOP,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Stop Key
-        {   0,      1,      18,         126,        KEY_EN_MEDIA_PREVIOUS,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Previous Track Key
-        {   0,      1,      19,         124,        KEY_EN_MEDIA_PLAY_PAUSE,    KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Play Pause Key
-        {   0,      1,      20,         125,        KEY_EN_MEDIA_NEXT,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Next Tack Key
+        /*-------------------------------------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                                             |
+        |   Zone,   Row,    Column,     Value,      Key,                        Alternate Name,             OpCode,                             |
+        \*-------------------------------------------------------------------------------------------------------------------------------------*/
+        {   0,      0,       0,         128,        "Profile",                  KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_ROW,         },  // Insert Profile into new row
+        {   0,      0,       1,         113,        "Light",                    KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Light key
+        {   0,      0,       2,         114,        "Lock",                     KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lock Key
+        {   0,      0,      10,         191,        "Logo",                     KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Logo
+        {   0,      0,      18,         102,        KEY_EN_MEDIA_MUTE,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Mute Key
+        {   0,      1,      17,         123,        KEY_EN_MEDIA_STOP,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Stop Key
+        {   0,      1,      18,         126,        KEY_EN_MEDIA_PREVIOUS,      KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Previous Track Key
+        {   0,      1,      19,         124,        KEY_EN_MEDIA_PLAY_PAUSE,    KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Play Pause Key
+        {   0,      1,      20,         125,        KEY_EN_MEDIA_NEXT,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Next Tack Key
     }
 };
 
@@ -135,20 +135,20 @@ keyboard_keymap_overlay_values corsair_K70_TKL_cs_layout
         }
     },
     {
-        /*---------------------------------------------------------------------------------------------------------*\
-        | Edit Keys                                                                                                 |
-        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
-        \*---------------------------------------------------------------------------------------------------------*/
-        {   0,      0,       1,         123,        KEY_EN_MEDIA_STOP,          KEYBOARD_OPCODE_INSERT_ROW,         },  // Insert Stop Key into new media keys row
-        {   0,      0,       2,         126,        KEY_EN_MEDIA_PREVIOUS,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Previous Track Key
-        {   0,      0,       3,         124,        KEY_EN_MEDIA_PLAY_PAUSE,    KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Play Pause Key
-        {   0,      0,       4,         125,        KEY_EN_MEDIA_NEXT,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Next Tack Key
-        {   0,      0,       7,           1,        "Logo L",                   KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert 'Logo Left'
-        {   0,      0,       8,           3,        "Logo R",                   KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert 'Logo Right'
-        {   0,      0,      11,         128,        "Profile",                  KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Profile
-        {   0,      0,      12,         113,        "Light",                    KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Light key
-        {   0,      0,      13,         114,        "Lock",                     KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lock Key
-        {   0,      0,      14,         102,        KEY_EN_MEDIA_MUTE,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Mute Key
+        /*-------------------------------------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                                             |
+        |   Zone,   Row,    Column,     Value,      Name,                       Alternate Name,             OpCode,                             |
+        \*-------------------------------------------------------------------------------------------------------------------------------------*/
+        {   0,      0,       1,         123,        KEY_EN_MEDIA_STOP,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_ROW,         },  // Insert Stop Key into new media keys row
+        {   0,      0,       2,         126,        KEY_EN_MEDIA_PREVIOUS,      KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Previous Track Key
+        {   0,      0,       3,         124,        KEY_EN_MEDIA_PLAY_PAUSE,    KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Play Pause Key
+        {   0,      0,       4,         125,        KEY_EN_MEDIA_NEXT,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Next Tack Key
+        {   0,      0,       7,           1,        "Logo L",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert 'Logo Left'
+        {   0,      0,       8,           3,        "Logo R",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert 'Logo Right'
+        {   0,      0,      11,         128,        "Profile",                  KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Profile
+        {   0,      0,      12,         113,        "Light",                    KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Light key
+        {   0,      0,      13,         114,        "Lock",                     KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Lock Key
+        {   0,      0,      14,         102,        KEY_EN_MEDIA_MUTE,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },  // Insert Mute Key
     }
 };
 
@@ -162,87 +162,87 @@ keyboard_keymap_overlay_values corsair_k100_layout
         }
     },
     {
-        /*---------------------------------------------------------------------------------------------------------*\
-        | Edit Keys                                                                                                 |
-        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
-        \*---------------------------------------------------------------------------------------------------------*/
+        /*-------------------------------------------------------------------------------------------------------------------------------------*\
+        | Edit Keys                                                                                                                             |
+        |   Zone,   Row,    Column,     Value,      Name,                       Alternate Name,             OpCode,                             |
+        \*-------------------------------------------------------------------------------------------------------------------------------------*/
         //media keys
-        {   0,      0,      17,         123,        KEY_EN_MEDIA_STOP,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      18,         126,        KEY_EN_MEDIA_PREVIOUS,      KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      19,         124,        KEY_EN_MEDIA_PLAY_PAUSE,    KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      20,         125,        KEY_EN_MEDIA_NEXT,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      17,         123,        KEY_EN_MEDIA_STOP,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      18,         126,        KEY_EN_MEDIA_PREVIOUS,      KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      19,         124,        KEY_EN_MEDIA_PLAY_PAUSE,    KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      20,         125,        KEY_EN_MEDIA_NEXT,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
         //upper row
-        {   0,      0,      1,          128,        "Profile",                  KEYBOARD_OPCODE_INSERT_ROW,         },
-        {   0,      0,      2,          137,        "iCue",                     KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      3,          114,        "Lock",                     KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      10,         190,        "Logo L",                   KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      11,         191,        "Logo M",                   KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      12,         192,        "Logo R",                   KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      18,         102,        KEY_EN_MEDIA_MUTE,          KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      1,          128,        "Profile",                  KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_ROW,         },
+        {   0,      0,      2,          137,        "iCue",                     KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      3,          114,        "Lock",                     KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      10,         190,        "Logo L",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      11,         191,        "Logo M",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      12,         192,        "Logo R",                   KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      18,         102,        KEY_EN_MEDIA_MUTE,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
         //macro keys
-        {   0,      1,      0,          131,        "G1",                       KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      2,      0,          132,        "G2",                       KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      3,      0,          133,        "G3",                       KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      4,      0,          134,        "G4",                       KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      5,      0,          135,        "G5",                       KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,      0,          136,        "G6",                       KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      1,      0,          131,        "G1",                       KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      2,      0,          132,        "G2",                       KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      3,      0,          133,        "G3",                       KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      4,      0,          134,        "G4",                       KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      5,      0,          135,        "G5",                       KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,      0,          136,        "G6",                       KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
         //underglow 44 entries
         //underglow upper
-        {   0,      0,      0,          138,        "Underglow 1",              KEYBOARD_OPCODE_INSERT_ROW,         },
-        {   0,      0,      1,          139,        "Underglow 2",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      2,          140,        "Underglow 3",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      3,          141,        "Underglow 4",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      4,          142,        "Underglow 5",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      5,          143,        "Underglow 6",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      6,          144,        "Underglow 7",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      7,          145,        "Underglow 8",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      8,          146,        "Underglow 9",              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      9,          147,        "Underglow 10",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      10,         148,        "Underglow 11",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      11,         149,        "Underglow 12",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      12,         150,        "Underglow 13",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      13,         151,        "Underglow 14",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      14,         152,        "Underglow 15",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      15,         153,        "Underglow 16",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      16,         154,        "Underglow 17",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      17,         155,        "Underglow 18",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      18,         156,        "Underglow 19",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      19,         157,        "Underglow 20",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      20,         158,        "Underglow 21",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      21,         159,        "Underglow 22",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      0,          138,        "Underglow 1",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_ROW,         },
+        {   0,      0,      1,          139,        "Underglow 2",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      2,          140,        "Underglow 3",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      3,          141,        "Underglow 4",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      4,          142,        "Underglow 5",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      5,          143,        "Underglow 6",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      6,          144,        "Underglow 7",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      7,          145,        "Underglow 8",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      8,          146,        "Underglow 9",              KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      9,          147,        "Underglow 10",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      10,         148,        "Underglow 11",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      11,         149,        "Underglow 12",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      12,         150,        "Underglow 13",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      13,         151,        "Underglow 14",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      14,         152,        "Underglow 15",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      15,         153,        "Underglow 16",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      16,         154,        "Underglow 17",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      17,         155,        "Underglow 18",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      18,         156,        "Underglow 19",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      19,         157,        "Underglow 20",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      20,         158,        "Underglow 21",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      21,         159,        "Underglow 22",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
         //underglow left
-        {   0,      0,      0,          160,        "Underglow 23",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      1,      0,          161,        "Underglow 24",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      2,      0,          162,        "Underglow 25",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      3,      0,          163,        "Underglow 26",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      4,      0,          164,        "Underglow 27",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      5,      0,          165,        "Underglow 28",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,      0,          166,        "Underglow 29",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      7,      0,          167,        "Underglow 30",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      8,      0,          168,        "Underglow 31",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      9,      0,          169,        "Underglow 32",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      10,     0,          170,        "Underglow 33",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      0,          160,        "Underglow 23",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      1,      0,          161,        "Underglow 24",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      2,      0,          162,        "Underglow 25",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      3,      0,          163,        "Underglow 26",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      4,      0,          164,        "Underglow 27",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      5,      0,          165,        "Underglow 28",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,      0,          166,        "Underglow 29",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      7,      0,          167,        "Underglow 30",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      8,      0,          168,        "Underglow 31",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      9,      0,          169,        "Underglow 32",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      10,     0,          170,        "Underglow 33",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
         //underglow right
-        {   0,      0,      23,         171,        "Underglow 34",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      1,      23,         172,        "Underglow 35",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      2,      23,         173,        "Underglow 36",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      3,      23,         174,        "Underglow 37",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      4,      23,         175,        "Underglow 38",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      5,      23,         176,        "Underglow 39",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      6,      23,         177,        "Underglow 40",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      7,      23,         178,        "Underglow 41",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      8,      23,         179,        "Underglow 42",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      9,      23,         180,        "Underglow 43",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      10,     23,         181,        "Underglow 44",             KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      23,         171,        "Underglow 34",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      1,      23,         172,        "Underglow 35",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      2,      23,         173,        "Underglow 36",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      3,      23,         174,        "Underglow 37",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      4,      23,         175,        "Underglow 38",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      5,      23,         176,        "Underglow 39",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      6,      23,         177,        "Underglow 40",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      7,      23,         178,        "Underglow 41",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      8,      23,         179,        "Underglow 42",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      9,      23,         180,        "Underglow 43",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      10,     23,         181,        "Underglow 44",             KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
         //wheel
-        {   0,      0,      0,          182,        "Wheel 1",                  KEYBOARD_OPCODE_INSERT_ROW,         },
-        {   0,      0,      1,          183,        "Wheel 2",                  KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      2,          184,        "Wheel 3",                  KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      3,          185,        "Wheel 4",                  KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      4,          186,        "Wheel 5",                  KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      5,          187,        "Wheel 6",                  KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      6,          188,        "Wheel 7",                  KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
-        {   0,      0,      7,          189,        "Wheel 8",                  KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      0,          182,        "Wheel 1",                  KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_ROW,         },
+        {   0,      0,      1,          183,        "Wheel 2",                  KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      2,          184,        "Wheel 3",                  KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      3,          185,        "Wheel 4",                  KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      4,          186,        "Wheel 5",                  KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      5,          187,        "Wheel 6",                  KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      6,          188,        "Wheel 7",                  KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
+        {   0,      0,      7,          189,        "Wheel 8",                  KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_SHIFT_RIGHT, },
     }
 };
 

Controllers/CorsairVengeanceProController/CorsairVengeanceProController.cpp

@@ -10,6 +10,7 @@
 \*---------------------------------------------------------*/
 
 #include <cstring>
+#include <chrono>
 #include "CorsairVengeanceProController.h"
 
 using namespace std::chrono_literals;

Controllers/DRGBController/DRGBController.cpp

@@ -20,6 +20,63 @@ DRGBController::DRGBController(hid_device* dev_handle, const char* path, unsigne
     dev         = dev_handle;
     location    = path;
     device_pid  = pid;
+
+    /*-----------------------------------------------------*\
+    | Initialize controller                                 |
+    \*-----------------------------------------------------*/
+    InitController();
+
+    /*-----------------------------------------------------*\
+    | Exit hardware effects.  Start a thread to continuously|
+    | send a keepalive packet every 500ms                   |
+    \*-----------------------------------------------------*/
+    keepalive_thread_run = 1;
+    keepalive_thread     = new std::thread(&DRGBController::KeepaliveThread, this);
+}
+
+DRGBController::~DRGBController()
+{
+    keepalive_thread_run = 0;
+    keepalive_thread->join();
+    delete keepalive_thread;
+    hid_close(dev);
+}
+
+void DRGBController::KeepaliveThread()
+{
+    unsigned char   sleep_buf[65];
+    sleep_buf[0] = 0x65;
+    while(keepalive_thread_run.load())
+    {
+        if((std::chrono::steady_clock::now() - last_commit_time) > std::chrono::seconds(1))
+        {
+            SendPacketFS(sleep_buf, 1, 0);
+        }
+        std::this_thread::sleep_for(500ms);
+    }
+}
+
+
+void DRGBController::InitController()
+{
+    /*-----------------------------------------------------*\
+    | Get version                                           |
+    \*-----------------------------------------------------*/
+    unsigned char cmd_data[65];
+    cmd_data[0]=0x00;
+    cmd_data[1]=0x02;
+    cmd_data[2]=0x00;
+    hid_write(dev, cmd_data, 65);
+    hid_read(dev, cmd_data, 6);
+    version[0] = cmd_data[1];
+    version[1] = cmd_data[2];
+    version[2] = cmd_data[3];
+    version[3] = cmd_data[4];
+}
+
+std::string DRGBController::GetFirmwareString()
+{
+    return "v"+std::to_string(version[0]) + "." + std::to_string(version[1]) + "." + std::to_string(version[2]) + "." + std::to_string(version[3]);
 }
 
 std::string DRGBController::GetLocationString()
@@ -80,17 +137,30 @@ void DRGBController::SendPacket(unsigned char* colors, unsigned int buf_packets
     }
 }
 
-void DRGBController::SendPacketFS(unsigned char* colors, unsigned int buf_packets , bool Array)
+void DRGBController::SendPacketFS(unsigned char* colors, unsigned int buf_packets , unsigned int Array)
 {
     unsigned char   usb_buf[65];
     unsigned int    buf_idx = 0;
     memset(usb_buf, 0x00, sizeof(usb_buf));
     usb_buf[0x00]   = 0x00;
-    if(Array)
+    if(Array == 0x64)
     {
         for(unsigned int i = 0; i < buf_packets; i++)
         {
-            usb_buf[1]  = i == buf_packets - 1 ? 200 + i : 100 + i;
+            usb_buf[1]  = i == buf_packets - 1 ? Array + 100 + i : Array + i;
+            buf_idx     = i*63;
+            for(unsigned int k=0;k<63;k++)
+            {
+                usb_buf[k+2] = colors[buf_idx + k];
+            }
+            hid_write(dev, usb_buf, 65);
+        }
+    }
+    else if(Array == 0x47)
+    {
+        for(unsigned int i = 0; i < buf_packets; i++)
+        {
+            usb_buf[1]  = i == buf_packets - 1 ? Array + 92 + i : Array + i;
             buf_idx     = i*63;
             for(unsigned int k=0;k<63;k++)
             {

Controllers/DRGBController/DRGBController.h

@@ -15,6 +15,7 @@
 #include <vector>
 #include <hidapi.h>
 #include "RGBController.h"
+#include "DeviceGuardManager.h"
 
 #define DRGB_V4_ONE_PACKAGE_SIZE    316
 #define DRGB_V4_PACKAGE_SIZE        340
@@ -25,14 +26,23 @@ class DRGBController
 {
 public:
     DRGBController(hid_device* dev_handle, const char* path,  unsigned short pid);
+    ~DRGBController();
+    void            KeepaliveThread();
+    void            InitController();
+    std::string     GetFirmwareString();
     std::string     GetLocationString();
     std::string     GetSerialString();
     unsigned short  GetDevicePID();
     void            SetChannelLEDs(unsigned char channel, RGBColor * colors, unsigned int num_colors);
     void            SendPacket(unsigned char* colors,unsigned int buf_packets ,unsigned int LEDtotal);
-    void            SendPacketFS(unsigned char* colors,unsigned int buf_packets ,bool Array);
+    void            SendPacketFS(unsigned char* colors,unsigned int buf_packets ,unsigned int Array);
 private:
     hid_device*             dev;
     std::string             location;
+    std::thread*            keepalive_thread;
+    std::atomic<bool>       keepalive_thread_run;
+    std::chrono::time_point<std::chrono::steady_clock> last_commit_time;
+    unsigned char           version[4] = {0, 0, 0,0};
+    DeviceGuardManager*                                 guard_manager_ptr;
     unsigned short          device_pid;
 };

Controllers/DRGBController/DRGBControllerDetect.cpp

@@ -37,9 +37,16 @@ REGISTER_HID_DETECTOR("DRGB SIG V4F", DetectDRGBControllers, DRGBV4_VID, DRGB_SI
 REGISTER_HID_DETECTOR("DRGB LED", DetectDRGBControllers, DRGBV3_VID, DRGB_LED_V3_PID);
 REGISTER_HID_DETECTOR("DRGB Ultra V3", DetectDRGBControllers, DRGBV3_VID, DRGB_Ultra_V3_PID);
 REGISTER_HID_DETECTOR("DRGB CORE V3", DetectDRGBControllers, DRGBV3_VID, DRGB_CORE_V3_PID);
+REGISTER_HID_DETECTOR("DRGB ELITE", DetectDRGBControllers, DRGBV3_VID, DRGB_ELITE_PID);
+REGISTER_HID_DETECTOR("NEEDMAX 10 ELITE", DetectDRGBControllers, DRGBV3_VID, DM_10_PID);
+REGISTER_HID_DETECTOR("JPU ELITE", DetectDRGBControllers, DRGBV3_VID, JPU_12_PID);
 
 REGISTER_HID_DETECTOR("DRGB LED Controller", DetectDRGBControllers, DRGBV2_VID, DRGB_LED_PID);
 REGISTER_HID_DETECTOR("DRGB ULTRA", DetectDRGBControllers, DRGBV2_VID, DRGB_ULTRA_PID);
 REGISTER_HID_DETECTOR("DRGB SIG AB", DetectDRGBControllers, DRGBV2_VID, DRGB_SIG_AB_PID);
 REGISTER_HID_DETECTOR("DRGB SIG CD", DetectDRGBControllers, DRGBV2_VID, DRGB_SIG_CD_PID);
 REGISTER_HID_DETECTOR("DRGB Strimer Controller", DetectDRGBControllers, DRGBV2_VID, DRGB_Strimer_PID);
+
+REGISTER_HID_DETECTOR("YICO 8 ELITE", DetectDRGBControllers, YICO_VID, YICO_8_PID);
+REGISTER_HID_DETECTOR("YICO 08 ELITE", DetectDRGBControllers, YICO_VID, YICO_08_PID);
+REGISTER_HID_DETECTOR("YICO 08 ELITE", DetectDRGBControllers, YICO_VID, YICO_08_1_PID);

Controllers/DRGBController/RGBController_DRGB.cpp

@@ -32,6 +32,7 @@ RGBController_DRGB::RGBController_DRGB(DRGBController* controller_ptr)
     vendor      = "DRGB";
     description = "DRGB Controller Device";
     type        = DEVICE_TYPE_LEDSTRIP;
+    version     = controller->GetFirmwareString();
     location    = controller->GetLocationString();
     serial      = controller->GetSerialString();
 
@@ -103,6 +104,21 @@ void RGBController_DRGB::SetupZones()
             NUM_Channel_led = 256;
             Version         = 3;
             break;
+        case DRGB_ELITE_PID:
+            NUM_CHANNELS    = 8;
+            NUM_Channel_led = 132;
+            Version         = 1;
+            break;
+        case DM_10_PID:
+            NUM_CHANNELS    = 10;
+            NUM_Channel_led = 132;
+            Version         = 1;
+            break;
+        case JPU_12_PID:
+            NUM_CHANNELS    = 12;
+            NUM_Channel_led = 60;
+            Version         = 1;
+            break;
 
         case DRGB_LED_PID:
             NUM_CHANNELS    = 8;
@@ -129,13 +145,29 @@ void RGBController_DRGB::SetupZones()
             NUM_Channel_led = 256;
             Version         = 2;
             break;
+
+        case YICO_8_PID:
+            NUM_CHANNELS    = 8;
+            NUM_Channel_led = 256;
+            Version         = 3;
+            break;
+        case YICO_08_PID:
+            NUM_CHANNELS    = 8;
+            NUM_Channel_led = 256;
+            Version         = 3;
+            break;
+        case YICO_08_1_PID:
+            NUM_CHANNELS    = 8;
+            NUM_Channel_led = 132;
+            Version         = 3;
+            break;
     }
 
     zones.resize(NUM_CHANNELS);
 
     for(unsigned int channel_idx = 0; channel_idx < NUM_CHANNELS; channel_idx++)
     {
-        char ch_idx_string[2];
+        char ch_idx_string[4];
         if(NUM_CHANNELS == 6)
         {
             if(channel_idx==0)
@@ -159,6 +191,11 @@ void RGBController_DRGB::SetupZones()
                 zones[channel_idx].name     = "Channel D";
             }
         }
+        else if(NUM_CHANNELS == 10 || NUM_CHANNELS == 12)
+        {
+            snprintf(ch_idx_string, 4, "%d", channel_idx+1 );
+            zones[channel_idx].name     = "Channel ";
+        }
         else if(channel_idx<8)
         {
             snprintf(ch_idx_string, 2, "%d", channel_idx + 1);
@@ -223,37 +260,6 @@ void RGBController_DRGB::SetupZones()
 
     SetupColors();
 
-    /*-----------------------------------------------------*\
-    |  Turn off hardware effects                            |
-    \*-----------------------------------------------------*/
-
-    if(Version > 2)
-    {
-        unsigned char   HWLData[64] = {0};
-        HWLData[0]  = 0x35;
-        HWLData[4]  = 0x00;
-        HWLData[5]  = 0x01;
-        HWLData[6]  = 0x01;
-        HWLData[7]  = 0x00;
-        HWLData[8]  = 0x00;
-        HWLData[9]  = 0xFF;
-        HWLData[10] = 0x00;
-        HWLData[11] = 0x00;
-        HWLData[12] = 0x00;
-        HWLData[13] = 0xFF;
-        HWLData[14] = 0x00;
-        HWLData[20] = 0xF0;
-        HWLData[21] = 0x00;
-
-        if(Version == 4)
-        {
-            controller->SendPacketFS(&HWLData[0], 1,0);
-        }
-        else if(Version == 3)
-        {
-            controller->SendPacketFS(&HWLData[0], 1,0);
-        }
-    }
 }
 
 void RGBController_DRGB::ResizeZone(int zone, int new_size)
@@ -336,7 +342,7 @@ void RGBController_DRGB::DeviceUpdateLEDs()
             }
             unsigned int    col_packets     = (led_index / DRGB_V3_PACKAGE_SIZE) + ((led_index % DRGB_V3_PACKAGE_SIZE) > 0);
             controller->SendPacketFS(&ArrayData[0], 1,0);
-            controller->SendPacketFS(&RGBData[0], col_packets,1);
+            controller->SendPacketFS(&RGBData[0], col_packets,0x64);
             break;
         }
 
@@ -369,6 +375,39 @@ void RGBController_DRGB::DeviceUpdateLEDs()
                 }
             }
             break;
+
+        case 1:
+        {
+            unsigned int    led_index = 0;
+            unsigned char   RGBData[1801*3]     = {0};
+            unsigned char   ArrayData[64]       = {0};
+            ArrayData[0] = 0x46;
+            ArrayData[1] = 0xBB;
+            for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
+            {
+                unsigned char   LEDnum      = zones[zone_idx].leds_count;
+                unsigned int    HighCount   = (LEDnum & 0xFFFF)>>8;
+                unsigned int    LowCount    = LEDnum & 0xFF;
+                ArrayData[zone_idx * 2 + 2] = HighCount;
+                ArrayData[zone_idx * 2 + 3] = LowCount;
+                for(unsigned int i=0; i<LEDnum;i++)
+                {
+                    unsigned int RGBcolors = zones[zone_idx].colors[i];
+                    RGBData[led_index * 3]      = RGBcolors & 0xFF;
+                    RGBData[led_index * 3 +1]   = (RGBcolors >> 8) & 0xFF;
+                    RGBData[led_index * 3 +2]   = (RGBcolors >> 16) & 0xFF;
+                    led_index++;
+                }
+                if(led_index>1800)
+                {
+                    break;
+                }
+            }
+            unsigned int    col_packets     = (led_index / DRGB_V3_PACKAGE_SIZE) + ((led_index % DRGB_V3_PACKAGE_SIZE) > 0);
+            controller->SendPacketFS(&ArrayData[0], 1,0);
+            controller->SendPacketFS(&RGBData[0], col_packets,0x47);
+            break;
+        }
     }
 }
 

Controllers/DRGBController/RGBController_DRGB.h

@@ -24,6 +24,9 @@
 #define DRGB_LED_V3_PID         0x1209
 #define DRGB_Ultra_V3_PID       0x1221
 #define DRGB_CORE_V3_PID        0x1226
+#define DRGB_ELITE_PID          0x1408
+#define DM_10_PID               0x1410
+#define JPU_12_PID              0x1412
 
 #define DRGBV2_VID              0x2023
 #define DRGB_LED_PID            0x1208
@@ -32,6 +35,11 @@
 #define DRGB_SIG_CD_PID         0x1211
 #define DRGB_Strimer_PID        0x1215
 
+#define YICO_VID                0x1368
+#define YICO_8_PID              0x6077
+#define YICO_08_PID             0x6078
+#define YICO_08_1_PID           0x6079
+
 class RGBController_DRGB : public RGBController
 {
 public:

Controllers/DebugController/DebugControllerDetect.cpp

@@ -411,6 +411,7 @@ void DetectDebugControllers()
                     led dummy_keyboard_led;
                     dummy_keyboard_led.name = new_kb.GetKeyNameAt(led_idx);
                     dummy_keyboard->leds.push_back(dummy_keyboard_led);
+                    dummy_keyboard->led_alt_names.push_back(new_kb.GetKeyAltNameAt(led_idx));
                 }
 
                 /*-----------------------------------------------------------------*\
@@ -444,6 +445,7 @@ void DetectDebugControllers()
                         dummy_keyboard_led.name = dummy_keyboard_underglow_matrix_zone.name + " LED ";
                         dummy_keyboard_led.name.append(std::to_string(led_idx));
                         dummy_keyboard->leds.push_back(dummy_keyboard_led);
+                        dummy_keyboard->led_alt_names.push_back("");
                     }
                 }
 
@@ -475,6 +477,7 @@ void DetectDebugControllers()
                         dummy_keyboard_led.name = "RGB Strip ";
                         dummy_keyboard_led.name.append(std::to_string(led_idx));
                         dummy_keyboard->leds.push_back(dummy_keyboard_led);
+                        dummy_keyboard->led_alt_names.push_back("");
                     }
                 }
 

Controllers/ENESMBusController/ENESMBusController.cpp

@@ -199,6 +199,17 @@ ENESMBusController::ENESMBusController(ENESMBusInterface* interface, ene_dev_id
         // Read LED count from configuration table
         led_count = config_table[ENE_CONFIG_LED_COUNT_0107];
     }
+    // AUMA0-E6K5-1113
+    // Found on ASUS ASTRAL 5080 OC
+    else if (strcmp(device_name, "AUMA0-E6K5-1113") == 0)
+    {
+        direct_reg  = ENE_REG_COLORS_DIRECT_V2;
+        effect_reg  = ENE_REG_COLORS_EFFECT_V2;
+        channel_cfg = ENE_CONFIG_CHANNEL_V2;
+
+        // Read LED count from configuration table
+        led_count = config_table[ENE_CONFIG_LED_COUNT_0107];
+    }
     // ROG ARION - ASUS ROG Arion external SSD enclosure
     // This device does not support ENE read, so we fake the device name string
     // if the interface is ROG Arion type.  It uses second generation registers.

Controllers/ENESMBusController/ENESMBusControllerDetect.cpp

@@ -352,12 +352,12 @@ REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 3060 Gaming OC",
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 3060 V2 Gaming OC",               DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3060_LHR_DEV,     ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_3060_O12G_LHR_GAMING,        0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS KO GeForce RTX 3060 V2 Gaming OC",                      DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3060_LHR_DEV,     ASUS_SUB_VEN,   ASUS_KO_RTX_3060_O12G_V2_GAMING,                0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS KO GeForce RTX 3060 Ti V2 Gaming OC",                   DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3060TI_LHR_DEV,   ASUS_SUB_VEN,   ASUS_KO_RTX3060TI_O8G_V2_GAMING,                0x67);
-REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 3060 Ti OC",                            DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3060TI_GDDR6X_DEV,ASUS_SUB_VEN,   ASUS_TUF_RTX_3060_TI_O8G,                       0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 3060 Ti OC",                            DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3060TI_GDDR6X_DEV,ASUS_SUB_VEN,   ASUS_TUF_RTX_3060TI_O8G,                        0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS KO GeForce RTX 3060 Ti Gaming OC",                      DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3060TI_DEV,       ASUS_SUB_VEN,   ASUS_KO_RTX3060TI_O8G_GAMING,                   0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS KO GeForce RTX 3060 Ti Gaming OC",                      DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3060TI_DEV,       ASUS_SUB_VEN,   ASUS_KO_RTX3060TI_08G_GAMING_2,                 0x67);
-REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 3060 Ti Gaming OC",                     DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3060TI_DEV,       ASUS_SUB_VEN,   ASUS_TUF_RTX_3060_TI_O8G_OC,                    0x67);
-REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 3060 Ti OC",                      DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3060TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_3060_TI_O8G_OC,                  0x67);
-REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 3060 Ti OC",                            DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3060TI_LHR_DEV,   ASUS_SUB_VEN,   ASUS_TUF_RTX_3060_TI_O8G_OC_V2,                 0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 3060 Ti Gaming OC",                     DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3060TI_DEV,       ASUS_SUB_VEN,   ASUS_TUF_RTX_3060TI_O8G_OC,                     0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 3060 Ti OC",                      DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3060TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_3060TI_O8G_OC,               0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 3060 Ti OC",                            DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3060TI_LHR_DEV,   ASUS_SUB_VEN,   ASUS_TUF_RTX_3060TI_O8G_OC_V2,                  0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 3060 Ti V2 OC",                   DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3060TI_LHR_DEV,   ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_3060TI_O8G_V2_GAMING,        0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 3070 OC",                         DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3070_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_3070_OC,                     0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 3070 Gaming OC",                  DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3070_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_3070_O8G_GAMING,             0x67);
@@ -400,6 +400,7 @@ REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 3080 Ti Gaming OC",
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG GeForce RTX STRIX 3080 Ti Gaming OC",               DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3080TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_3080TI_O12G_GAMING,          0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX LC GeForce RTX 3080 Ti Gaming OC",            DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3080TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_3080TI_O12G_GAMING_LC,       0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 3090 Gaming",                     DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3090_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_3090_24G_GAMING,             0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 3090 Gaming",                     DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3090_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_3090_24G_GAMING_V2,          0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 3090 Gaming OC",                  DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3090_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_3090_O24G_GAMING,            0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 3090 Gaming White OC",            DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3090_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_3090_O24G_GAMING_WHITE,      0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 3090 Gaming OC",                        DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX3090_DEV,         ASUS_SUB_VEN,   ASUS_TUF_RTX_3090_O24G,                         0x67);
@@ -416,6 +417,7 @@ REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 4070 Gaming OC",
 REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 4070 Gaming OC",                        DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4070_DEV,         ASUS_SUB_VEN,   ASUS_TUF_RTX_4070_O12G_GAMING_3,                0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 4070 SUPER Gaming",                     DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4070S_DEV,        ASUS_SUB_VEN,   ASUS_TUF_RTX_4070S_12G_GAMING,                  0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 4070 Gaming OC",                  DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4070_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_4070_O12G_GAMING,            0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 4070 SUPER Gaming",               DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4070S_DEV,        ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_4070S_12G_GAMING,            0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 4070 SUPER Gaming OC",            DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4070S_DEV,        ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_4070S_O12G_GAMING,           0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 4070 Ti Gaming",                        DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4070TI_DEV,       ASUS_SUB_VEN,   ASUS_TUF_RTX_4070TI_12G_GAMING,                 0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 4070 Ti Gaming",                        DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4070TI_DEV,       ASUS_SUB_VEN,   ASUS_TUF_RTX_4070TI_12G_GAMING_88DD,            0x67);
@@ -444,6 +446,7 @@ REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 4080 SUPER OC",
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 4080 SUPER White",                DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4080S_DEV,        ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_4080S_16G_GAMING_WHITE,      0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 4080 SUPER White OC",             DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4080S_DEV,        ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_4080S_016G_GAMING_WHITE,     0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 4080 SUPER Gaming OC",                  DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4080S_DEV,        ASUS_SUB_VEN,   ASUS_TUF_RTX_4080S_O16G_OC_GAMING,              0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 4080 SUPER Gaming OC",                  DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4080S_DEV,        ASUS_SUB_VEN,   ASUS_TUF_RTX_4080S_O16G_OC_GAMING_2,            0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 4090 Gaming OC",                        DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4090_DEV,         ASUS_SUB_VEN,   ASUS_TUF_RTX_4090_O24G_OC_GAMING,               0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 4090 Gaming OG OC",                     DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4090_DEV,         ASUS_SUB_VEN,   ASUS_TUF_RTX_4090_O24G_OG_OC_GAMING,            0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 4090 Gaming OC",                        DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4090_DEV,         ASUS_SUB_VEN,   ASUS_TUF_RTX_4090_O24G_GAMING,                  0x67);
@@ -457,9 +460,19 @@ REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 4090 Gaming",
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 4090 OC EVA-02",                  DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4090_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_4090_024G_EVA_02,            0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 4090 Gaming OC",                  DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4090_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_4090_O24G_GAMING_8932,       0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 4090 Gaming White",               DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4090_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_4090_24G_GAMING_WHITE,       0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 4090 Gaming White",               DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4090_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_4090_24G_GAMING_WHITE_2,     0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 4090 Gaming White OC",            DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4090_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_4090_O24G_GAMING_WHITE,      0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 4090 Gaming White OC",            DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4090_DEV,         ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_4090_O24G_GAMING_WHITE_2,    0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS ROG MATRIX PLATINUM GeForce RTX 4090",                  DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX4090_DEV,         ASUS_SUB_VEN,   ASUS_ROG_MATRIX_PLATINUM_RTX_4090_24G,          0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 5070 Gaming",                           DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX5070_DEV,         ASUS_SUB_VEN,   ASUS_TUF_RTX_5070_O12G_GAMING,                  0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 5070 Ti Gaming OC",                     DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX5070TI_DEV,       ASUS_SUB_VEN,   ASUS_TUF_RTX_5070TI_O16G_GAMING,                0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX GeForce RTX 5070 Ti Gaming OC",               DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX5070TI_DEV,       ASUS_SUB_VEN,   ASUS_ROG_STRIX_RTX_5070TI_O16G_GAMING_OC,       0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 5080 Gaming OC",                        DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX5080_DEV,         ASUS_SUB_VEN,   ASUS_TUF_RTX_5080_O16G_GAMING,                  0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS TUF GeForce RTX 5090 Gaming OC",                        DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX5090_DEV,         ASUS_SUB_VEN,   ASUS_TUF_RTX_5090_O32G_GAMING,                  0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG ASTRAL GeForce RTX 5080 OC",                        DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX5080_DEV,         ASUS_SUB_VEN,   ASUS_ROG_ASTRAL_RTX_5080_O16G_GAMING,           0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG ASTRAL GeForce RTX 5080",                           DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX5080_DEV,         ASUS_SUB_VEN,   ASUS_ROG_ASTRAL_RTX_5080_16G_GAMING,            0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG ASTRAL GeForce RTX 5090 OC",                        DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX5090_DEV,         ASUS_SUB_VEN,   ASUS_ROG_ASTRAL_RTX_5090_O32G_GAMING,           0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS ROG ASTRAL LC GeForce RTX 5090 OC",                     DetectENESMBusGPUControllers,   NVIDIA_VEN,     NVIDIA_RTX5090_DEV,         ASUS_SUB_VEN,   ASUS_ROG_ASTRAL_LC_RTX_5090_O32G_GAMING,        0x67);
 
 /*-----------------------------------------*\
 |  AMD GPUs                                 |
@@ -483,6 +496,8 @@ REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX LC Radeon RX 6950 XT Gaming OC",
 REGISTER_I2C_PCI_DETECTOR("ASUS TUF Radeon RX 7600 XT O16G Gaming",                     DetectENESMBusGPUControllers,   AMD_GPU_VEN,    AMD_NAVI33_DEV,             ASUS_SUB_VEN,   ASUS_TUF_RX_7600XT_O16G_GAMING,                 0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS TUF Radeon RX 7700 XT Gaming OC",                       DetectENESMBusGPUControllers,   AMD_GPU_VEN,    AMD_NAVI32_DEV,             ASUS_SUB_VEN,   ASUS_TUF_RX_7700XT_012G_GAMING,                 0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS TUF Radeon RX 7800 XT Gaming OC",                       DetectENESMBusGPUControllers,   AMD_GPU_VEN,    AMD_NAVI32_DEV,             ASUS_SUB_VEN,   ASUS_TUF_RX_7800XT_O16G_GAMING,                 0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS TUF Radeon RX 7800 XT Gaming OC",                       DetectENESMBusGPUControllers,   AMD_GPU_VEN,    AMD_NAVI32_DEV,             ASUS_SUB_VEN,   ASUS_TUF_RX_7800XT_O16G_GAMING_0606,            0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS TUF Radeon RX 7800 XT Gaming White OC",                 DetectENESMBusGPUControllers,   AMD_GPU_VEN,    AMD_NAVI32_DEV,             ASUS_SUB_VEN,   ASUS_TUF_RX_7800XT_O16G_WHITE_GAMING,           0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS TUF Radeon RX 7900 XT Gaming OC",                       DetectENESMBusGPUControllers,   AMD_GPU_VEN,    AMD_NAVI31_DEV,             ASUS_SUB_VEN,   ASUS_TUF_RX_7900XT_020G_GAMING,                 0x67);
 REGISTER_I2C_PCI_DETECTOR("ASUS TUF Radeon RX 7900 XTX Gaming OC",                      DetectENESMBusGPUControllers,   AMD_GPU_VEN,    AMD_NAVI31_DEV,             ASUS_SUB_VEN,   ASUS_TUF_RX_7900XTX_O24G_GAMING,                0x67);
+REGISTER_I2C_PCI_DETECTOR("ASUS TUF Radeon RX 9070 XT Gaming OC",                       DetectENESMBusGPUControllers,   AMD_GPU_VEN,    AMD_NAVI48_DEV,             ASUS_SUB_VEN,   ASUS_TUF_RX_9070XT_016G_GAMING,                 0x67);

Controllers/EVGAAmpereGPUController/EVGAAmpereGPUControllerDetect.cpp

@@ -54,6 +54,7 @@ void DetectEVGAAmpereGPUControllers(i2c_smbus_interface* bus, uint8_t address, c
 REGISTER_I2C_PCI_DETECTOR("EVGA GeForce RTX 3060 Ti FTW3 Gaming"                , DetectEVGAAmpereGPUControllers, NVIDIA_VEN,   NVIDIA_RTX3060TI_DEV,       EVGA_SUB_VEN,   EVGA_RTX3060TI_FTW3_GAMING_SUB_DEV,             0x2D);
 REGISTER_I2C_PCI_DETECTOR("EVGA GeForce RTX 3060 Ti FTW3 Ultra"                 , DetectEVGAAmpereGPUControllers, NVIDIA_VEN,   NVIDIA_RTX3060TI_DEV,       EVGA_SUB_VEN,   EVGA_RTX3060TI_FTW3_ULTRA_SUB_DEV,              0x2D);
 REGISTER_I2C_PCI_DETECTOR("EVGA GeForce RTX 3060 Ti FTW3 Ultra LHR"             , DetectEVGAAmpereGPUControllers, NVIDIA_VEN,   NVIDIA_RTX3060TI_LHR_DEV,   EVGA_SUB_VEN,   EVGA_RTX3060TI_FTW3_ULTRA_KL_SUB_DEV,           0x2D);
+REGISTER_I2C_PCI_DETECTOR("EVGA GeForce RTX 3060 Ti FTW3 Ultra Gaming LHR"      , DetectEVGAAmpereGPUControllers, NVIDIA_VEN,   NVIDIA_RTX3060TI_LHR_DEV,   EVGA_SUB_VEN,   EVGA_RTX3060TI_FTW3_ULTRA_GAMING_LHR_SUB_DEV,   0x2D);
 REGISTER_I2C_PCI_DETECTOR("EVGA GeForce RTX 3070 Black Gaming"                  , DetectEVGAAmpereGPUControllers, NVIDIA_VEN,   NVIDIA_RTX3070_DEV,         EVGA_SUB_VEN,   EVGA_RTX3070_XC3_BLACK_SUB_DEV,                 0x2D);
 REGISTER_I2C_PCI_DETECTOR("EVGA GeForce RTX 3070 XC3 Gaming"                    , DetectEVGAAmpereGPUControllers, NVIDIA_VEN,   NVIDIA_RTX3070_DEV,         EVGA_SUB_VEN,   EVGA_RTX3070_XC3_GAMING_SUB_DEV,                0x2D);
 REGISTER_I2C_PCI_DETECTOR("EVGA GeForce RTX 3070 XC3 Ultra"                     , DetectEVGAAmpereGPUControllers, NVIDIA_VEN,   NVIDIA_RTX3070_DEV,         EVGA_SUB_VEN,   EVGA_RTX3070_XC3_ULTRA_SUB_DEV,                 0x2D);

Controllers/EVGAGP102GPUController/EVGAGP102GPUControllerDetect.cpp

@@ -34,10 +34,10 @@ static const gpu_pci_device device_list[] =
     { NVIDIA_VEN,   NVIDIA_GTX1080_DEV,         EVGA_SUB_VEN,   EVGA_GTX1080_FTW2_SUB_DEV,              "EVGA GeForce GTX 1080 FTW2 Gaming"                     },
     { NVIDIA_VEN,   NVIDIA_GTX1080_DEV,         EVGA_SUB_VEN,   EVGA_GTX1080_FTW2_11G_SUB_DEV,          "EVGA GeForce GTX 1080 FTW2 11G"                        },
     { NVIDIA_VEN,   NVIDIA_GTX1080_DEV,         EVGA_SUB_VEN,   EVGA_GTX1080_FTW2_DT_SUB_DEV,           "EVGA GeForce GTX 1080 FTW2 DT"                         },
-    { NVIDIA_VEN,   NVIDIA_GTX1080TI_DEV,       EVGA_SUB_VEN,   EVGA_GTX1080TI_SC2_GAMING_SUB_DEV,      "EVGA GeForce GTX 1080 Ti SC2 Gaming"                           },
-    { NVIDIA_VEN,   NVIDIA_GTX1080TI_DEV,       EVGA_SUB_VEN,   EVGA_GTX1080TI_FTW3_SUB_DEV,            "EVGA GeForce GTX 1080 Ti FTW3"                                 },
-    { NVIDIA_VEN,   NVIDIA_GTX1080TI_DEV,       EVGA_SUB_VEN,   EVGA_GTX1080TI_FTW3_HYBRID_SUB_DEV,     "EVGA GeForce GTX 1080 Ti FTW3 Hybrid"                          },
-    { NVIDIA_VEN,   NVIDIA_GTX1080TI_DEV,       EVGA_SUB_VEN,   EVGA_GTX1080TI_KINGPIN_SUB_DEV,         "EVGA GeForce GTX 1080 Ti K|NGP|N"                              },
+    { NVIDIA_VEN,   NVIDIA_GTX1080TI_DEV,       EVGA_SUB_VEN,   EVGA_GTX1080TI_SC2_GAMING_SUB_DEV,      "EVGA GeForce GTX 1080 Ti SC2 Gaming"                   },
+    { NVIDIA_VEN,   NVIDIA_GTX1080TI_DEV,       EVGA_SUB_VEN,   EVGA_GTX1080TI_FTW3_SUB_DEV,            "EVGA GeForce GTX 1080 Ti FTW3"                         },
+    { NVIDIA_VEN,   NVIDIA_GTX1080TI_DEV,       EVGA_SUB_VEN,   EVGA_GTX1080TI_FTW3_HYBRID_SUB_DEV,     "EVGA GeForce GTX 1080 Ti FTW3 Hybrid"                  },
+    { NVIDIA_VEN,   NVIDIA_GTX1080TI_DEV,       EVGA_SUB_VEN,   EVGA_GTX1080TI_KINGPIN_SUB_DEV,         "EVGA GeForce GTX 1080 Ti K|NGP|N"                      },
 };
 /******************************************************************************************\
 *                                                                                          *

Controllers/EVisionKeyboardController/EVisionV2KeyboardController.cpp

@@ -348,8 +348,8 @@ void EVisionV2KeyboardController::SetMode(EVisionV2KeyboardPart part, const Evis
         Write(EVISION_V2_CMD_WRITE_CONFIG, EVISION_V2_OFFSET_CURRENT_PROFILE, &current_profile, 1);
     }
 
-    uint16_t offset;
-    uint8_t size;
+    uint16_t offset = 0;
+    uint8_t size    = 0;
 
     offset = current_profile * 0x40 + EVISION_V2_OFFSET_FIRST_PROFILE;
 

Controllers/ElgatoKeyLightController/ElgatoKeyLightController.cpp

@@ -11,7 +11,7 @@
 
 #include <iostream>
 #include "ElgatoKeyLightController.h"
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 

Controllers/ElgatoLightStripController/ElgatoLightStripController.cpp

@@ -14,7 +14,7 @@
 #include <thread>
 #include <vector>
 #include "ElgatoLightStripController.h"
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 #include "LogManager.h"
 
 using json = nlohmann::json;

Controllers/FanBusController/FanBusInterface.cpp

@@ -9,6 +9,7 @@
 |   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/
 
+#include <chrono>
 #include <thread>
 #include "FanBusInterface.h"
 

Controllers/FaustusController/RGBController_Faustus_Linux.cpp

@@ -25,9 +25,9 @@
 
 RGBController_Faustus::RGBController_Faustus(const std::string& dev_path)
 {
-    name        = "ASUS TUF Keyboard";
+    name        = "ASUS TUF Laptop Keyboard";
     vendor      = "ASUS";
-    type        = DEVICE_TYPE_KEYBOARD;
+    type        = DEVICE_TYPE_LAPTOP;
     description = "Faustus Device";
 
     modes.resize(4);

Controllers/GainwardGPUController/GainwardGPUControllerDetect.cpp

@@ -102,8 +102,8 @@ void DetectGainwardGPUControllers(i2c_smbus_interface* bus, uint8_t i2c_addr, co
 } /* DetectGainwardGPUControllers() */
 
 REGISTER_I2C_PCI_DETECTOR("Gainward GeForce GTX 1080 Phoenix",          DetectGainwardGPUControllers,   NVIDIA_VEN, NVIDIA_GTX1080_DEV,     GAINWARD_SUB_VEN,   GAINWARD_GTX_1080_PHOENIX,      0x08);
-REGISTER_I2C_PCI_DETECTOR("Gainward GeForce GTX 1080 Ti Phoenix",       DetectGainwardGPUControllers,   NVIDIA_VEN, NVIDIA_GTX1080TI_DEV,   GAINWARD_SUB_VEN,   GAINWARD_GTX_1080_TI_PHOENIX,   0x08);
-REGISTER_I2C_PCI_DETECTOR("Gainward GeForce GTX 1660 SUPER Ghost",      DetectGainwardGPUControllers,   NVIDIA_VEN, NVIDIA_GTX1660S_DEV,    NVIDIA_VEN,         NVIDIA_GTX1660S_DEV,            0x49);
+REGISTER_I2C_PCI_DETECTOR("Gainward GeForce GTX 1080 Ti Phoenix",       DetectGainwardGPUControllers,   NVIDIA_VEN, NVIDIA_GTX1080TI_DEV,   GAINWARD_SUB_VEN,   GAINWARD_GTX_1080TI_PHOENIX,    0x08);
+REGISTER_I2C_PCI_DETECTOR("Gainward GeForce GTX 1660 SUPER Ghost",      DetectGainwardGPUControllers,   NVIDIA_VEN, NVIDIA_GTX1660S_DEV,    NVIDIA_SUB_VEN,     NVIDIA_GTX1660S_DEV,            0x49);
 REGISTER_I2C_PCI_DETECTOR("Gainward GeForce RTX 2070 SUPER Phantom",    DetectGainwardGPUControllers,   NVIDIA_VEN, NVIDIA_RTX2070S_OC_DEV, GAINWARD_SUB_VEN,   NVIDIA_RTX2070S_OC_DEV,         0x49);
 REGISTER_I2C_PCI_DETECTOR("Gainward GeForce RTX 2080 Phoenix GS",       DetectGainwardGPUControllers,   NVIDIA_VEN, NVIDIA_RTX2080_DEV,     GAINWARD_SUB_VEN,   NVIDIA_RTX2080_A_DEV,           0x49);
 REGISTER_I2C_PCI_DETECTOR("Gainward GeForce RTX 3070 Phantom",          DetectGainwardGPUControllers,   NVIDIA_VEN, NVIDIA_RTX3070_DEV,     GAINWARD_SUB_VEN,   GAINWARD_RTX_3070_PHANTOM,      0x49);

Controllers/GalaxGPUController/GalaxGPUControllerDetect.cpp

@@ -30,7 +30,7 @@ bool TestForGalaxGPUController(i2c_smbus_interface* bus, unsigned char address)
     unsigned char res  = bus->i2c_smbus_read_byte_data(address, 0x00);
     unsigned char res2 = bus->i2c_smbus_read_byte_data(address, 0x01);
 
-    if((res == 0x27 || res == 0x26) && res2 == 0x10)
+    if((res == 0x27 || res == 0x26) && (res2 == 0x10 || res2 == 0x20))
     {
         pass = true;
     }
@@ -65,4 +65,4 @@ REGISTER_I2C_PCI_DETECTOR("KFA2 GeForce RTX 2070 OC",                       Dete
 REGISTER_I2C_PCI_DETECTOR("GALAX GeForce RTX 2070 SUPER EX Gamer Black",    DetectGalaxGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2070S_OC_DEV, NVIDIA_SUB_VEN, GALAX_RTX_2070S_EX_GAMER_BLACK_SUB_DEV, 0x23);
 REGISTER_I2C_PCI_DETECTOR("KFA2 GeForce RTX 2080 EX OC",                    DetectGalaxGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2080_DEV,     NVIDIA_SUB_VEN, KFA2_RTX_2080_EX_OC_SUB_DEV,            0x23);
 REGISTER_I2C_PCI_DETECTOR("KFA2 GeForce RTX 2080 SUPER EX OC",              DetectGalaxGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2080S_DEV,    NVIDIA_SUB_VEN, KFA2_RTX_2080_SUPER_EX_OC_SUB_DEV,      0x23);
-REGISTER_I2C_PCI_DETECTOR("KFA2 GeForce RTX 2080 Ti EX OC",                 DetectGalaxGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2080TI_DEV,   NVIDIA_SUB_VEN, KFA2_RTX_2080_TI_EX_OC_SUB_DEV,         0x23);
+REGISTER_I2C_PCI_DETECTOR("KFA2 GeForce RTX 2080 Ti EX OC",                 DetectGalaxGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2080TI_DEV,   NVIDIA_SUB_VEN, KFA2_RTX_2080TI_EX_OC_SUB_DEV,          0x23);

Controllers/GigabyteAorusLaptopController/RGBController_GigabyteAorusLaptop.cpp

@@ -75,7 +75,7 @@ RGBController_GigabyteAorusLaptop::RGBController_GigabyteAorusLaptop(GigabyteAor
     this->dev_type                          = dev_type;
     controller                              = controller_ptr;
     vendor                                  = "Gigabyte";
-    type                                    = DEVICE_TYPE_KEYBOARD;
+    type                                    = DEVICE_TYPE_LAPTOP;
     description                             = "Aorus Laptop";
     location                                = controller->GetDeviceLocation();
     serial                                  = controller->GetSerialString();

Controllers/GigabyteRGBFusion2BlackwellGPUController/GigabyteRGBFusion2BlackwellGPUController.cpp

@@ -0,0 +1,82 @@
+/*---------------------------------------------------------*\
+| GigabyteRGBFusion2BlackwellGPUController.cpp              |
+|                                                           |
+|   Driver for Gigabyte RGB Fusion 2 Blackwell GPU          |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include <chrono>
+#include <thread>
+#include "GigabyteRGBFusion2BlackwellGPUController.h"
+#include "GigabyteRGBFusion2BlackwellGPUDefinitions.h"
+#include "LogManager.h"
+
+using namespace std::chrono_literals;
+
+RGBFusion2BlackwellGPUController::RGBFusion2BlackwellGPUController(i2c_smbus_interface* bus, rgb_fusion_dev_id dev)
+{
+    this->bus = bus;
+    this->dev = dev;
+}
+
+RGBFusion2BlackwellGPUController::~RGBFusion2BlackwellGPUController()
+{
+
+}
+
+std::string RGBFusion2BlackwellGPUController::GetDeviceLocation()
+{
+    std::string return_string(bus->device_name);
+    char addr[5];
+    snprintf(addr, 5, "0x%02X", dev);
+    return_string.append(", address ");
+    return_string.append(addr);
+    return("I2C: " + return_string);
+}
+
+void RGBFusion2BlackwellGPUController::SaveConfig()
+{
+    uint8_t data_pkt[64] = { 0x13, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+    bus->i2c_write_block(dev, sizeof(data_pkt), data_pkt);
+}
+
+void RGBFusion2BlackwellGPUController::SetMode(uint8_t zone, uint8_t mode, fusion2_config zone_config)
+{
+    if(zone < RGB_FUSION_2_BLACKWELL_GPU_NUMBER_OF_ZONES)
+        this->zone_color[zone] = zone_config.colors[0];
+
+    /************************************************************************************\
+    *                                                                                    *
+    *       Packet (total size = 64 bytes)                                               *
+    *           MODE SPD  BRT  R    G    B    0    ZONE SZ0-8                            *
+    * 0x12 0x01 0x08 0x06 0x0A 0xFF 0xFF 0x00 0x00 0x00 0x08 [R] [G] [B] [R] [G] [B] ... *
+    *                                                                                    *
+    * SZ is the amount of colors that will be sent in the format of 3 bytes RGB          *
+    *                                                                                    *
+    \************************************************************************************/
+    uint8_t zone_pkt[64] = {RGB_FUSION2_BLACKWELL_GPU_REG_COLOR, 0x01, mode, zone_config.speed, zone_config.brightness, RGBGetRValue(this->zone_color[zone]), RGBGetGValue(this->zone_color[zone]), RGBGetBValue(this->zone_color[zone]), 0x00, zone, zone_config.numberOfColors, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+    if(zone_config.numberOfColors > 0)
+    {
+        int currentPos = 12;
+        for(uint8_t i = 0; i < zone_config.numberOfColors; i++)
+        {
+            zone_pkt[currentPos + 0] = RGBGetRValue(zone_config.colors[i]);
+            zone_pkt[currentPos + 1] = RGBGetGValue(zone_config.colors[i]);
+            zone_pkt[currentPos + 2] = RGBGetBValue(zone_config.colors[i]);
+            currentPos += 3;
+        }
+    }
+
+    bus->i2c_write_block(dev, sizeof(zone_pkt), zone_pkt);
+}
+
+void RGBFusion2BlackwellGPUController::SetZone(uint8_t zone, uint8_t mode, fusion2_config zone_config)
+{
+    if(mode == RGB_FUSION2_BLACKWELL_GPU_MODE_BREATHING)
+        zone_config.brightness = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+
+    SetMode(zone, mode, zone_config);
+}

Controllers/GigabyteRGBFusion2BlackwellGPUController/GigabyteRGBFusion2BlackwellGPUController.h

@@ -0,0 +1,83 @@
+/*---------------------------------------------------------*\
+| GigabyteRGBFusion2BlackwellGPUController.h                |
+|                                                           |
+|   Driver for Gigabyte RGB Fusion 2 Blackwell GPU          |
+|                                                           |
+|   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"
+#include "GigabyteRGBFusion2BlackwellGPUDefinitions.h"
+
+typedef unsigned char   rgb_fusion_dev_id;
+
+struct fusion2_config
+{
+    uint8_t     brightness;
+    RGBColor    colors[8];
+    uint8_t     numberOfColors;
+    uint8_t     speed;
+    uint8_t     direction;
+};
+
+enum
+{
+    RGB_FUSION2_BLACKWELL_GPU_REG_COLOR            = 0x12,
+    RGB_FUSION2_BLACKWELL_GPU_REG_MODE             = 0x16  // Used for 'Intelligent' mode
+};
+
+enum
+{
+    RGB_FUSION2_BLACKWELL_GPU_MODE_STATIC          = 0x01,
+    RGB_FUSION2_BLACKWELL_GPU_MODE_BREATHING       = 0x02,
+    RGB_FUSION2_BLACKWELL_GPU_MODE_FLASHING        = 0x03,
+    RGB_FUSION2_BLACKWELL_GPU_MODE_DUAL_FLASHING   = 0x04,
+    RGB_FUSION2_BLACKWELL_GPU_MODE_COLOR_CYCLE     = 0x05,
+    RGB_FUSION2_BLACKWELL_GPU_MODE_WAVE            = 0x06, //not available to Eagle/Aero
+    RGB_FUSION2_BLACKWELL_GPU_MODE_GRADIENT        = 0x07, //not available to Eagle/Aero
+    RGB_FUSION2_BLACKWELL_GPU_MODE_COLOR_SHIFT     = 0x08, //not available to Eagle/Aero
+    RGB_FUSION2_BLACKWELL_GPU_MODE_DAZZLE          = 0x0A, //not available to Eagle/Aero
+};
+
+enum
+{
+    RGB_FUSION2_BLACKWELL_GPU_SPEED_SLOWEST        = 0x01,
+    RGB_FUSION2_BLACKWELL_GPU_SPEED_NORMAL         = 0x03,
+    RGB_FUSION2_BLACKWELL_GPU_SPEED_FASTEST        = 0x06
+};
+
+enum
+{
+    RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MIN       = 0x01,
+    RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX       = 0x0A
+};
+
+enum
+{
+    RGB_FUSION2_BLACKWELL_GPU_SINGLE_ZONE          = 0,
+    RGB_FUSION2_BLACKWELL_GPU_GAMING_LAYOUT        = 1,
+};
+
+class RGBFusion2BlackwellGPUController
+{
+public:
+    RGBFusion2BlackwellGPUController(i2c_smbus_interface* bus, rgb_fusion_dev_id dev);
+    ~RGBFusion2BlackwellGPUController();
+
+    RGBColor        zone_color[RGB_FUSION_2_BLACKWELL_GPU_NUMBER_OF_ZONES];
+
+    std::string     GetDeviceLocation();
+    void            SaveConfig();
+
+    void            SetZone(uint8_t zone, uint8_t mode, fusion2_config zone_config);
+    void            SetMode(uint8_t zone, uint8_t mode, fusion2_config zone_config);
+private:
+    i2c_smbus_interface*    bus;
+    rgb_fusion_dev_id       dev;
+
+};

Controllers/GigabyteRGBFusion2BlackwellGPUController/GigabyteRGBFusion2BlackwellGPUControllerDetect.cpp

@@ -0,0 +1,141 @@
+/*---------------------------------------------------------*\
+| GigabyteRGBFusion2BlackwellGPUControllerDetect.cpp        |
+|                                                           |
+|   Detector for Gigabyte RGB Fusion 2 Blackwell GPU        |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include <stdio.h>
+#include "Detector.h"
+#include "GigabyteRGBFusion2BlackwellGPUController.h"
+#include "LogManager.h"
+#include "RGBController_GigabyteRGBFusion2BlackwellGPU.h"
+#include "i2c_smbus.h"
+#include "pci_ids.h"
+
+#define GIGABYTEGPU_CONTROLLER_NAME3    "Gigabyte RGB Fusion2 Blackwell GPU"
+
+/******************************************************************************************\
+*                                                                                          *
+*   TestForGigabyteRGBFusion2BlackwellGPUController                                        *
+*                                                                                          *
+*       Tests the given address to see if an RGB Fusion2 controller exists there.  First   *
+*       does a quick write to test for a response                                          *
+*                                                                                          *
+\******************************************************************************************/
+
+bool TestForGigabyteRGBFusion2BlackwellGPUController(i2c_smbus_interface* bus, unsigned char address)
+{
+    bool pass = false;
+    int res, pktsz;
+    const int read_sz = 4;
+    const int write_sz = 64; //0x40
+    uint8_t data_pkt[write_sz] = { 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+    uint8_t data_readpkt[read_sz] = {};
+
+    res = bus->i2c_write_block(address, write_sz, data_pkt);
+
+    pass = true;
+
+    pktsz = read_sz;
+    res = bus->i2c_read_block(address, &pktsz, data_readpkt);
+
+    //What we have seen returned so far...
+    //GeForce RTX 5070 Ti Eagle OC 16G                          0x01 0x01 0x01 0x00
+    //GeForce RTX 5070 Ti Gaming OC 16G                         0x01 0x01 0x01 0x00
+    //GeForce RTX 5070 Gaming OC 12G                            0x01 0x01 0x01 0x00
+
+    if(res < 0 || data_readpkt[0] != 0x01 || data_readpkt[1] != 0x01 || data_readpkt[2] != 0x01)
+    {
+        // Assemble C-string with respons for debugging
+        std::string text = "";
+
+        for(int idx = 0; idx < read_sz; ++idx)
+        {
+            char str[6];
+            snprintf(str, 6, " 0x%02X", data_readpkt[idx]);
+            text.append(str);
+        }
+
+        LOG_DEBUG("[%s] at address 0x%02X invalid. Expected 0x01 0x01 0x01 [0x*] but received:%s", GIGABYTEGPU_CONTROLLER_NAME3, address, text.c_str());
+        pass = false;
+    }
+
+    return(pass);
+}   /* TestForRGBFusion2BlackwellGPUController() */
+
+/*******************************************************************************************\
+*                                                                                           *
+*   DetectGigabyteRGBFusion2BlackwellGPUControllers                                         *
+*                                                                                           *
+*       Detect GigabyteRGB Fusion2 controllers with a specified layout on the enumerated    *
+*       I2C busses.                                                                         *
+*                                                                                           *
+*           bus - pointer to i2c_smbus_interface where RGB Fusion2 device is connected      *
+*           dev - I2C address of RGB Fusion2 device                                         *
+*                                                                                           *
+\*******************************************************************************************/
+
+void DetectGigabyteRGBFusion2BlackwellGPUControllers(i2c_smbus_interface* bus, uint8_t i2c_addr, const std::string& name, uint8_t led_zones)
+{
+    // Check for RGB Fusion2 controller
+    if(TestForGigabyteRGBFusion2BlackwellGPUController(bus, i2c_addr))
+    {
+        RGBFusion2BlackwellGPUController* controller = new RGBFusion2BlackwellGPUController(bus, i2c_addr);
+        RGBController_RGBFusion2BlackwellGPU* rgb_controller = new RGBController_RGBFusion2BlackwellGPU(controller, led_zones);
+        rgb_controller->name = name;
+
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
+    }
+}   /* DetectGigabyteRGBFusion2BlackwellMultiZoneGPUControllers() */
+
+/*******************************************************************************************\
+*                                                                                           *
+*   DetectGigabyteRGBFusion2BlackwellSingleZoneGPUControllers                               *
+*                                                                                           *
+*       Detect GigabyteRGB Fusion2 controllers with one zone on the enumerated I2C busses.  *
+*                                                                                           *
+*           bus - pointer to i2c_smbus_interface where RGB Fusion2 device is connected      *
+*           dev - I2C address of RGB Fusion2 device                                         *
+*                                                                                           *
+\*******************************************************************************************/
+
+void DetectGigabyteRGBFusion2BlackwellSingleZoneGPUControllers(i2c_smbus_interface* bus, uint8_t i2c_addr, const std::string& name)
+{
+    DetectGigabyteRGBFusion2BlackwellGPUControllers(bus, i2c_addr, name, RGB_FUSION2_BLACKWELL_GPU_SINGLE_ZONE);
+}   /* DetectGigabyteRGBFusion2BlackwellSingleZoneGPUControllers() */
+
+/*******************************************************************************************\
+*                                                                                           *
+*   DetectGigabyteRGBFusion2BlackwellGamingLayoutGPUControllers                             *
+*                                                                                           *
+*       Detect GigabyteRGB Fusion2 controllers with gaming layouts on the enumerated I2C    *
+*       busses.                                                                             *
+*                                                                                           *
+*           bus - pointer to i2c_smbus_interface where RGB Fusion2 device is connected      *
+*           dev - I2C address of RGB Fusion2 device                                         *
+*                                                                                           *
+\*******************************************************************************************/
+
+void DetectGigabyteRGBFusion2BlackwellGamingLayoutGPUControllers(i2c_smbus_interface* bus, uint8_t i2c_addr, const std::string& name)
+{
+    DetectGigabyteRGBFusion2BlackwellGPUControllers(bus, i2c_addr, name, RGB_FUSION2_BLACKWELL_GPU_GAMING_LAYOUT);
+}   /* DetectGigabyteRGBFusion2BlackwellMultiZoneGPUControllers() */
+
+/*-----------------------------------------*\
+|  Nvidia GPUs                              |
+\*-----------------------------------------*/
+
+REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 5070 Gaming OC",                    DetectGigabyteRGBFusion2BlackwellGamingLayoutGPUControllers,    NVIDIA_VEN, NVIDIA_RTX5070_DEV,     GIGABYTE_SUB_VEN, GIGABYTE_RTX5070_GAMING_OC_16G_SUB_DEV,         0x75);
+REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 5070 Ti Eagle OC",                  DetectGigabyteRGBFusion2BlackwellSingleZoneGPUControllers,      NVIDIA_VEN, NVIDIA_RTX5070TI_DEV,   GIGABYTE_SUB_VEN, GIGABYTE_RTX5070TI_EAGLE_OC_16G_SUB_DEV,        0x75);
+REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 5070 Ti Aero OC",                   DetectGigabyteRGBFusion2BlackwellSingleZoneGPUControllers,      NVIDIA_VEN, NVIDIA_RTX5070TI_DEV,   GIGABYTE_SUB_VEN, GIGABYTE_RTX5070TI_AERO_OC_16G_SUB_DEV,         0x75);
+REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 5070 Ti Gaming OC",                 DetectGigabyteRGBFusion2BlackwellGamingLayoutGPUControllers,    NVIDIA_VEN, NVIDIA_RTX5070TI_DEV,   GIGABYTE_SUB_VEN, GIGABYTE_RTX5070TI_GAMING_OC_16G_SUB_DEV,       0x75);
+REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 5080 Gaming OC",                    DetectGigabyteRGBFusion2BlackwellGamingLayoutGPUControllers,    NVIDIA_VEN, NVIDIA_RTX5080_DEV,     GIGABYTE_SUB_VEN, GIGABYTE_RTX5080_GAMING_OC_16G_SUB_DEV,       0x75);
+REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 5090 Gaming OC",                    DetectGigabyteRGBFusion2BlackwellGamingLayoutGPUControllers,    NVIDIA_VEN, NVIDIA_RTX5090_DEV,     GIGABYTE_SUB_VEN, GIGABYTE_RTX5090_GAMING_OC_32G_SUB_DEV,         0x75);
+
+/*-----------------------------------------*\
+|  AMD GPUs                                 |
+\*-----------------------------------------*/
+

Controllers/GigabyteRGBFusion2BlackwellGPUController/GigabyteRGBFusion2BlackwellGPUDefinitions.h

@@ -0,0 +1,12 @@
+/*---------------------------------------------------------*\
+| GigabyteRGBFusion2BlackwellGPUDefinitions.h               |
+|                                                           |
+|   Definitions for Gigabyte RGB Fusion 2 Blackwell GPU     |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#define RGB_FUSION_2_BLACKWELL_GPU_NUMBER_OF_ZONES 6

Controllers/GigabyteRGBFusion2BlackwellGPUController/RGBController_GigabyteRGBFusion2BlackwellGPU.cpp

@@ -0,0 +1,296 @@
+/*---------------------------------------------------------*\
+| RGBController_GigabyteRGBFusion2BlackwellGPU.cpp          |
+|                                                           |
+|   RGBController for Gigabyte RGB Fusion 2 Blackwell GPU   |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include "RGBController_GigabyteRGBFusion2BlackwellGPU.h"
+#include "LogManager.h"
+#include "GigabyteRGBFusion2BlackwellGPUDefinitions.h"
+
+/**------------------------------------------------------------------*\
+    @name Gigabyte Fusion 2 Blackwell GPU
+    @category GPU
+    @type I2C
+    @save :white_check_mark:
+    @direct :white_check_mark:
+    @effects :white_check_mark:
+    @detectors DetectGigabyteRGBFusion2BlackwellGPUControllers
+    @comment
+\*-------------------------------------------------------------------*/
+
+RGBController_RGBFusion2BlackwellGPU::RGBController_RGBFusion2BlackwellGPU(RGBFusion2BlackwellGPUController* controller_ptr, uint8_t led_layout)
+{
+    controller  = controller_ptr;
+
+    gpu_layout = led_layout;
+
+    name        = "Gigabyte GPU";
+    vendor      = "Gigabyte";
+    description = "Gigabyte RGB Fusion 2 Blackwell GPU";
+    location    = controller->GetDeviceLocation();
+
+    type = DEVICE_TYPE_GPU;
+
+    mode Direct;
+    Direct.name                 = "Direct";
+    Direct.value                = RGB_FUSION2_BLACKWELL_GPU_MODE_STATIC;
+    Direct.flags                = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
+    Direct.color_mode           = MODE_COLORS_PER_LED;
+    Direct.brightness_min       = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MIN;
+    Direct.brightness_max       = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+    Direct.brightness           = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+    modes.push_back(Direct);
+
+    mode Breathing;
+    Breathing.name              = "Pulse";
+    Breathing.value             = RGB_FUSION2_BLACKWELL_GPU_MODE_BREATHING;
+    Breathing.flags             = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_MANUAL_SAVE;
+    Breathing.speed_min         = RGB_FUSION2_BLACKWELL_GPU_SPEED_SLOWEST;
+    Breathing.speed_max         = RGB_FUSION2_BLACKWELL_GPU_SPEED_FASTEST;
+    Breathing.speed             = RGB_FUSION2_BLACKWELL_GPU_SPEED_NORMAL;
+    Breathing.color_mode        = MODE_COLORS_PER_LED;
+    Breathing.brightness_min    = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MIN;
+    Breathing.brightness_max    = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+    Breathing.brightness        = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+    modes.push_back(Breathing);
+
+    mode Flashing;
+    Flashing.name               = "Flash";
+    Flashing.value              = RGB_FUSION2_BLACKWELL_GPU_MODE_FLASHING;
+    Flashing.flags              = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
+    Flashing.speed_min          = RGB_FUSION2_BLACKWELL_GPU_SPEED_SLOWEST;
+    Flashing.speed_max          = RGB_FUSION2_BLACKWELL_GPU_SPEED_FASTEST;
+    Flashing.speed              = RGB_FUSION2_BLACKWELL_GPU_SPEED_NORMAL;
+    Flashing.color_mode         = MODE_COLORS_PER_LED;
+    Flashing.brightness_min     = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MIN;
+    Flashing.brightness_max     = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+    Flashing.brightness         = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+    modes.push_back(Flashing);
+
+    mode DualFlashing;
+    DualFlashing.name           = "Double Flash";
+    DualFlashing.value          = RGB_FUSION2_BLACKWELL_GPU_MODE_DUAL_FLASHING;
+    DualFlashing.flags          = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
+    DualFlashing.speed_min      = RGB_FUSION2_BLACKWELL_GPU_SPEED_SLOWEST;
+    DualFlashing.speed_max      = RGB_FUSION2_BLACKWELL_GPU_SPEED_FASTEST;
+    DualFlashing.speed          = RGB_FUSION2_BLACKWELL_GPU_SPEED_NORMAL;
+    DualFlashing.color_mode     = MODE_COLORS_PER_LED;
+    DualFlashing.brightness_min = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MIN;
+    DualFlashing.brightness_max = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+    DualFlashing.brightness     = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+    modes.push_back(DualFlashing);
+
+    mode SpectrumCycle;
+    SpectrumCycle.name              = "Color Cycle";
+    SpectrumCycle.value             = RGB_FUSION2_BLACKWELL_GPU_MODE_COLOR_CYCLE;
+    SpectrumCycle.flags             = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
+    SpectrumCycle.speed_min         = RGB_FUSION2_BLACKWELL_GPU_SPEED_SLOWEST;
+    SpectrumCycle.speed_max         = RGB_FUSION2_BLACKWELL_GPU_SPEED_FASTEST;
+    SpectrumCycle.speed             = RGB_FUSION2_BLACKWELL_GPU_SPEED_NORMAL;
+    SpectrumCycle.color_mode        = MODE_COLORS_NONE;
+    SpectrumCycle.brightness_min    = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MIN;
+    SpectrumCycle.brightness_max    = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+    SpectrumCycle.brightness        = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+    modes.push_back(SpectrumCycle);
+
+    if(led_layout == RGB_FUSION2_BLACKWELL_GPU_GAMING_LAYOUT)
+    {
+        mode Wave;
+        Wave.name = "Wave";
+        Wave.value = RGB_FUSION2_BLACKWELL_GPU_MODE_WAVE;
+        Wave.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
+        Wave.speed_min = RGB_FUSION2_BLACKWELL_GPU_SPEED_SLOWEST;
+        Wave.speed_max = RGB_FUSION2_BLACKWELL_GPU_SPEED_FASTEST;
+        Wave.speed = RGB_FUSION2_BLACKWELL_GPU_SPEED_NORMAL;
+        Wave.color_mode = MODE_COLORS_NONE;
+        Wave.brightness_min = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MIN;
+        Wave.brightness_max = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+        Wave.brightness = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+        modes.push_back(Wave);
+
+        mode Gradient;
+        Gradient.name = "Gradient";
+        Gradient.value = RGB_FUSION2_BLACKWELL_GPU_MODE_GRADIENT;
+        Gradient.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
+        Gradient.speed_min = RGB_FUSION2_BLACKWELL_GPU_SPEED_SLOWEST;
+        Gradient.speed_max = RGB_FUSION2_BLACKWELL_GPU_SPEED_FASTEST;
+        Gradient.speed = RGB_FUSION2_BLACKWELL_GPU_SPEED_NORMAL;
+        Gradient.color_mode = MODE_COLORS_PER_LED;
+        Gradient.brightness_min = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MIN;
+        Gradient.brightness_max = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+        Gradient.brightness = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+        modes.push_back(Gradient);
+
+        mode ColorShift;
+        ColorShift.name = "Color Shift";
+        ColorShift.value = RGB_FUSION2_BLACKWELL_GPU_MODE_COLOR_SHIFT;
+        ColorShift.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
+        ColorShift.speed_min = RGB_FUSION2_BLACKWELL_GPU_SPEED_SLOWEST;
+        ColorShift.speed_max = RGB_FUSION2_BLACKWELL_GPU_SPEED_FASTEST;
+        ColorShift.speed = RGB_FUSION2_BLACKWELL_GPU_SPEED_NORMAL;
+        ColorShift.color_mode = MODE_COLORS_MODE_SPECIFIC;
+        ColorShift.colors_min = 1;
+        ColorShift.colors_max = 8;
+        ColorShift.colors.resize(8);
+        ColorShift.brightness_min = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MIN;
+        ColorShift.brightness_max = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+        ColorShift.brightness = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+        modes.push_back(ColorShift);
+
+        /* Disabled Dazzle as it seems to only execute once, would need to loop it maybe?
+        * 
+        mode Dazzle;
+        Dazzle.name = "Dazzle";
+        Dazzle.value = RGB_FUSION2_BLACKWELL_GPU_MODE_DAZZLE;
+        Dazzle.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
+        Dazzle.speed_min = RGB_FUSION2_BLACKWELL_GPU_SPEED_SLOWEST;
+        Dazzle.speed_max = RGB_FUSION2_BLACKWELL_GPU_SPEED_FASTEST;
+        Dazzle.speed = RGB_FUSION2_BLACKWELL_GPU_SPEED_NORMAL;
+        Dazzle.color_mode = MODE_COLORS_MODE_SPECIFIC;
+        Dazzle.colors_min = 1;
+        Dazzle.colors_max = 8;
+        Dazzle.colors.resize(8);
+        Dazzle.brightness_min = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MIN;
+        Dazzle.brightness_max = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+        Dazzle.brightness = RGB_FUSION2_BLACKWELL_GPU_BRIGHTNESS_MAX;
+        modes.push_back(Dazzle);*/
+    }
+
+    SetupZones();
+}
+
+RGBController_RGBFusion2BlackwellGPU::~RGBController_RGBFusion2BlackwellGPU()
+{
+    delete controller;
+}
+
+void RGBController_RGBFusion2BlackwellGPU::SetupZones()
+{
+    /*---------------------------------------------------------*\
+    | This device only allows setting the entire zone for all   |
+    | LED's in the zone and does not allow per LED control.     |
+    \*---------------------------------------------------------*/
+
+    if(gpu_layout == RGB_FUSION2_BLACKWELL_GPU_SINGLE_ZONE)
+    {
+        zone new_zone;
+        led  new_led;
+
+        new_zone.name = "Side";
+        new_zone.type = ZONE_TYPE_SINGLE;
+        new_zone.leds_min = 1;
+        new_zone.leds_max = 1;
+        new_zone.leds_count = 1;
+        new_zone.matrix_map = NULL;
+
+        new_led.name = new_zone.name;
+        /*---------------------------------------------------------*\
+        | Push the zone and LED on to device vectors                |
+        \*---------------------------------------------------------*/
+        leds.push_back(new_led);
+        zones.push_back(new_zone);
+    }
+    else if(gpu_layout == RGB_FUSION2_BLACKWELL_GPU_GAMING_LAYOUT)
+    {
+        for(uint8_t zone_idx = 0; zone_idx < 4; zone_idx++)
+        {
+            zone new_zone;
+            led  new_led;
+
+            switch(zone_idx)
+            {
+                case 0: new_zone.name = "Right fan"; break;
+                case 1: new_zone.name = "Left fan"; break;
+                case 2: new_zone.name = "Center fan"; break;
+                case 3: new_zone.name = "Side"; break;
+            }
+            new_zone.type = ZONE_TYPE_SINGLE;
+            new_zone.leds_min = 1;
+            new_zone.leds_max = 1;
+            new_zone.leds_count = 1;
+            new_zone.matrix_map = NULL;
+
+            new_led.name = new_zone.name;
+            /*---------------------------------------------------------*\
+            | Push the zone and LED on to device vectors                |
+            \*---------------------------------------------------------*/
+            leds.push_back(new_led);
+            zones.push_back(new_zone);
+        }
+    }
+
+    SetupColors();
+}
+
+void RGBController_RGBFusion2BlackwellGPU::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_RGBFusion2BlackwellGPU::DeviceUpdateLEDs()
+{
+    fusion2_config zone_config;
+
+    zone_config.brightness      = modes[active_mode].brightness;
+    zone_config.speed           = modes[active_mode].speed;
+    zone_config.direction       = modes[active_mode].direction;
+    zone_config.numberOfColors  = 0;
+    if(modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC)
+        zone_config.numberOfColors = (uint8_t)modes[active_mode].colors.size();
+
+    if(zones.size() == 1)
+    {
+        zone_config.colors[0] = colors[0];
+
+        for(uint8_t i = 0; i < zone_config.numberOfColors; i++)
+        {
+            zone_config.colors[i] = modes[active_mode].colors[i];
+        }
+
+        controller->SetZone(0, modes[active_mode].value, zone_config);
+    }
+    else
+    {
+        // replicating GCC that sends up to 0x05 even when there is less zones
+        for(uint8_t zone_idx = 0; zone_idx < RGB_FUSION_2_BLACKWELL_GPU_NUMBER_OF_ZONES; zone_idx++)
+        {
+            if(zone_idx >= zones.size())
+                zone_config.colors[0] = colors.back();
+            else
+                zone_config.colors[0] = colors[zone_idx];
+
+            for(uint8_t i = 0; i < zone_config.numberOfColors; i++)
+            {
+                zone_config.colors[i] = modes[active_mode].colors[i];
+            }
+
+            controller->SetZone(zone_idx, modes[active_mode].value, zone_config);
+        }
+    }
+}
+
+void RGBController_RGBFusion2BlackwellGPU::UpdateZoneLEDs(int /*zone*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_RGBFusion2BlackwellGPU::UpdateSingleLED(int /*led*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_RGBFusion2BlackwellGPU::DeviceUpdateMode()
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_RGBFusion2BlackwellGPU::DeviceSaveMode()
+{
+    controller->SaveConfig();
+}

Controllers/GigabyteRGBFusion2BlackwellGPUController/RGBController_GigabyteRGBFusion2BlackwellGPU.h

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------*\
+| RGBController_GigabyteRGBFusion2BlackwellGPU.h            |
+|                                                           |
+|   RGBController for Gigabyte RGB Fusion 2 Blackwell GPU   |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "GigabyteRGBFusion2BlackwellGPUController.h"
+
+class RGBController_RGBFusion2BlackwellGPU : public RGBController
+{
+public:
+    RGBController_RGBFusion2BlackwellGPU(RGBFusion2BlackwellGPUController* controller_ptr, uint8_t led_layout);
+    ~RGBController_RGBFusion2BlackwellGPU();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+    void        DeviceSaveMode();
+
+private:
+    RGBFusion2BlackwellGPUController* controller;
+    uint8_t     gpu_layout;
+};

Controllers/GigabyteRGBFusion2GPUController/GigabyteRGBFusion2GPUControllerDetect.cpp

@@ -105,6 +105,7 @@ void DetectGigabyteRGBFusion2GPUControllers(i2c_smbus_interface* bus, uint8_t i2
 
 REGISTER_I2C_PCI_DETECTOR("Gigabyte AORUS GeForce RTX 2060 SUPER",                     DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX2060S_OC_DEV,     GIGABYTE_SUB_VEN,   GIGABYTE_AORUS_RTX2060S_V1_SUB_DEV_H,           0x50);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte AORUS GeForce RTX 2060 SUPER",                     DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX2060S_OC_DEV,     GIGABYTE_SUB_VEN,   GIGABYTE_AORUS_RTX2060S_V1_SUB_DEV_P,           0x50);
+REGISTER_I2C_PCI_DETECTOR("Gigabyte AORUS GeForce RTX 2070",                           DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX2070_OC_DEV,      GIGABYTE_SUB_VEN,   GIGABYTE_AORUS_RTX2070_SUB_DEV,                 0x50);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte AORUS GeForce RTX 2070 XTREME",                    DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX2070_OC_DEV,      GIGABYTE_SUB_VEN,   GIGABYTE_AORUS_RTX2070_XTREME_SUB_DEV_H,        0x50);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte AORUS GeForce RTX 2070 XTREME",                    DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX2070_OC_DEV,      GIGABYTE_SUB_VEN,   GIGABYTE_AORUS_RTX2070_XTREME_SUB_DEV_P,        0x50);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte AORUS GeForce RTX 2070 SUPER",                     DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX2070S_OC_DEV,     GIGABYTE_SUB_VEN,   GIGABYTE_AORUS_RTX2070S_8G_SUB_DEV_H,           0x50);
@@ -152,7 +153,10 @@ REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 4070 Ti GAMING",
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 4070 Ti GAMING OC",                    DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX4070TI_DEV,       GIGABYTE_SUB_VEN,   GIGABYTE_RTX4070TI_GAMING_OC_12G,               0x71);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 4070 Ti GAMING OC",                    DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX4070TI_DEV,       GIGABYTE_SUB_VEN,   GIGABYTE_RTX4070TI_GAMING_OC_12G_SUB_DEV2,      0x71);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 4070 Ti Eagle OC",                     DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX4070TI_DEV,       GIGABYTE_SUB_VEN,   GIGABYTE_RTX4070TI_EAGLE_OC_SUB_DEV,            0x71);
+REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 4070 Eagle OC",                        DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX4070_DEV,         GIGABYTE_SUB_VEN,   GIGABYTE_RTX4070_EAGLE_OC_SUB_DEV,              0x71);
+REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 4070 Ti Eagle OC Rev 2",               DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX4070TI_DEV,       GIGABYTE_SUB_VEN,   GIGABYTE_RTX4070TI_EAGLE_OC_V2_SUB_DEV,         0x71);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 4070 Ti Master",                       DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX4070TI_DEV,       GIGABYTE_SUB_VEN,   GIGABYTE_RTX4070TI_MASTER_12G,                  0x71);
+REGISTER_I2C_PCI_DETECTOR("Gigabyte AORUS GeForce RTX 4070 Ti ELITE",                  DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX4070TI_DEV,       GIGABYTE_SUB_VEN,   GIGABYTE_RTX4070TI_ELITE_12G,                   0x71);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 4070 Ti SUPER GAMING OC",              DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX4070TIS_DEV,      GIGABYTE_SUB_VEN,   GIGABYTE_RTX4070TIS_GAMING_OC_16G_SUB_DEV,      0x71);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 4080 AERO OC",                         DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX4080_DEV,         GIGABYTE_SUB_VEN,   GIGABYTE_RTX4080_AERO_OC_SUB_DEV,               0x71);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 4080 Eagle OC",                        DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX4080_DEV,         GIGABYTE_SUB_VEN,   GIGABYTE_RTX4080_EAGLE_OC_SUB_DEV,              0x71);
@@ -163,9 +167,13 @@ REGISTER_I2C_PCI_DETECTOR("Gigabyte AORUS GeForce RTX 4080 MASTER",
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 4090 AERO OC",                         DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX4090_DEV,         GIGABYTE_SUB_VEN,   GIGABYTE_RTX4090_AERO_OC_24G_SUB_DEV,           0x71);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 4090 GAMING OC",                       DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX4090_DEV,         GIGABYTE_SUB_VEN,   GIGABYTE_RTX4090_GAMING_OC_24G_SUB_DEV,         0x71);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte AORUS GeForce RTX 4090 MASTER",                    DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX4090_DEV,         GIGABYTE_SUB_VEN,   GIGABYTE_AORUS_RTX4090_MASTER_24G_SUB_DEV,      0x71);
+REGISTER_I2C_PCI_DETECTOR("Gigabyte AORUS GeForce RTX 5090 MASTER",                    DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX5090_DEV,         GIGABYTE_SUB_VEN,   GIGABYTE_AORUS_RTX5090_MASTER_32G_SUB_DEV,      0x71);
+REGISTER_I2C_PCI_DETECTOR("Gigabyte AORUS GeForce RTX 5090 MASTER ICE",                DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX5090_DEV,         GIGABYTE_SUB_VEN,   GIGABYTE_AORUS_RTX5090_MASTER_ICE_32G_SUB_DEV,  0x71);
+REGISTER_I2C_PCI_DETECTOR("Gigabyte AORUS GeForce RTX 5090 D MASTER",                  DetectGigabyteRGBFusion2GPUControllers, NVIDIA_VEN, NVIDIA_RTX5090D_DEV,        GIGABYTE_SUB_VEN,   GIGABYTE_AORUS_RTX5090D_MASTER_32G_SUB_DEV,     0x71);
 
 /*-----------------------------------------*\
 |  AMD GPUs                                 |
 \*-----------------------------------------*/
 
 REGISTER_I2C_PCI_DETECTOR("Gigabyte Radeon RX 7800 XT GAMING OC",                      DetectGigabyteRGBFusion2GPUControllers, AMD_GPU_VEN, AMD_NAVI32_DEV,            GIGABYTE_SUB_VEN,   GIGABYTE_RX7800XT_GAMING_OC_16G_SUB_DEV,        0x62);
+REGISTER_I2C_PCI_DETECTOR("Gigabyte AORUS RX 6750 XT ELITE 12G",                       DetectGigabyteRGBFusion2GPUControllers, AMD_GPU_VEN, AMD_NAVI22_DEV,            GIGABYTE_SUB_VEN,   GIGABYTE_AORUS_RX_6750_XT_ELITE_12G_SUB_DEV,    0x70);

Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.cpp

@@ -30,10 +30,10 @@ static RGBCalibration GigabyteCalibrationsLookup
 
 static calibration GigabyteBoardCalibration
 {
-    { "D_LED1",     "GRB"   },
-    { "D_LED2",     "GRB"   },
-    { "Mainboard",  "BGR"   },
-    { "Spare",      "BGR"   }
+    { "D_LED1",            "GRB"   },
+    { "D_LED2/D_LED3",     "GRB"   },
+    { "Mainboard",         "BGR"   },
+    { "Spare",             "BGR"   }
 };
 
 static LEDCount LedCountToEnum(unsigned int c)
@@ -60,7 +60,7 @@ static LEDCount LedCountToEnum(unsigned int c)
     }
 }
 
-RGBFusion2USBController::RGBFusion2USBController(hid_device* handle, const char *path, std::string mb_name) : dev(handle)
+RGBFusion2USBController::RGBFusion2USBController(hid_device* handle, const char *path, std::string mb_name, uint16_t pid) : dev(handle), product_id(pid)
 {
     int res                     = 0;
     char text[64]               = { 0x00 };
@@ -69,7 +69,7 @@ RGBFusion2USBController::RGBFusion2USBController(hid_device* handle, const char
     if(dev)
     {
         SetCalibration();
-
+        
         name = mb_name;
 
         /*---------------------------------------------------------*\
@@ -93,12 +93,14 @@ RGBFusion2USBController::RGBFusion2USBController(hid_device* handle, const char
             snprintf(text, 11, "0x%08X", report.chip_id);
             chip_id = text;
 
-            D_LED1_count = LedCountToEnum(report.total_leds & 0x0F);
-            D_LED2_count = LedCountToEnum(report.total_leds & 0xF0);
+            D_LED1_count = LedCountToEnum(report.curr_led_count_low & 0x0F);
+            D_LED2_count = LedCountToEnum((report.curr_led_count_low >> 4) & 0x0F);
+            D_LED3_count = LedCountToEnum(report.curr_led_count_high & 0x0F);
         }
 
         location = path;
 
+        ResetController(pid);
         EnableBeat(false);
     }
 }
@@ -160,6 +162,8 @@ void RGBFusion2USBController::SetCalibration()
     | If Calibration settings are not found then write them out |
     | Calibration will only be executed if it is explicitly     |
     | enabled by the user                                       |
+    | *Note IT5711 calibration is only partially functional.    |
+    | *Use Calibration at your own risk.                        |   
     \*---------------------------------------------------------*/
     if(!device_settings.contains(json_cal))
     {
@@ -171,19 +175,19 @@ void RGBFusion2USBController::SetCalibration()
     }
     else if(device_settings[json_cal]["Enabled"])
     {
-        GigabyteBoardCalibration["D_LED1"]      = device_settings[json_cal]["Data"]["D_LED1"];
-        GigabyteBoardCalibration["D_LED2"]      = device_settings[json_cal]["Data"]["D_LED2"];
-        GigabyteBoardCalibration["Mainboard"]   = device_settings[json_cal]["Data"]["Mainboard"];
-        GigabyteBoardCalibration["Spare"]       = device_settings[json_cal]["Data"]["Spare"];
+        GigabyteBoardCalibration["D_LED1"]          = device_settings[json_cal]["Data"]["D_LED1"];
+        GigabyteBoardCalibration["D_LED2/D_LED3"]   = device_settings[json_cal]["Data"]["D_LED2/D_LED3"];
+        GigabyteBoardCalibration["Mainboard"]       = device_settings[json_cal]["Data"]["Mainboard"];
+        GigabyteBoardCalibration["Spare"]           = device_settings[json_cal]["Data"]["Spare"];
 
         uint8_t buffer[64]                      = { 0x00 };
         buffer[0]                               = report_id;
         buffer[1]                               = 0x33;
 
-        SetCalibrationBuffer( GigabyteBoardCalibration.find("D_LED1")->second,      buffer, 2);
-        SetCalibrationBuffer( GigabyteBoardCalibration.find("D_LED2")->second,      buffer, 6);
-        SetCalibrationBuffer( GigabyteBoardCalibration.find("Mainboard")->second,   buffer, 10);
-        SetCalibrationBuffer( GigabyteBoardCalibration.find("Spare")->second,       buffer, 14);
+        SetCalibrationBuffer(GigabyteBoardCalibration["D_LED1"],          buffer, 2);
+        SetCalibrationBuffer(GigabyteBoardCalibration["D_LED2/D_LED3"],   buffer, 6);
+        SetCalibrationBuffer(GigabyteBoardCalibration["Mainboard"],       buffer, 10);
+        SetCalibrationBuffer(GigabyteBoardCalibration["Spare"],           buffer, 14);
 
         SendPacket(buffer);
     }
@@ -192,18 +196,27 @@ void RGBFusion2USBController::SetCalibration()
 void RGBFusion2USBController::SetLedCount(unsigned int led, unsigned int count)
 {
     /*-----------------------------------------------------------------*\
-    | Check which Digital LED we're setting then send the value of both |
+    | Check which Digital LED we're setting then send the value of each |
     \*-----------------------------------------------------------------*/
     if(led == HDR_D_LED1)
     {
         D_LED1_count = LedCountToEnum(count);
     }
-    else
+    else if(led == HDR_D_LED2)
     {
         D_LED2_count = LedCountToEnum(count);
     }
+    else if(led == HDR_D_LED3)
+    {
+        D_LED3_count = LedCountToEnum(count);
+    }
+    unsigned char buffer[64] = { 0 };
+    buffer[0] = report_id;      // 0xCC
+    buffer[1] = 0x34;           // CC34 command
+    buffer[2] = (D_LED2_count << 4) | D_LED1_count;
+    buffer[3] = D_LED3_count;
 
-    SendPacket(0x34, D_LED1_count | (D_LED2_count << 4));
+    SendPacket(buffer);         // Send full HID feature report
 }
 
 bool RGBFusion2USBController::DisableBuiltinEffect(int enable_bit, int mask)
@@ -268,18 +281,19 @@ void RGBFusion2USBController::SetStripColors
     PktRGB pkt;
     pkt.Init(hdr, report_id);
 
-    /*-------------------------------------------------------------------------*\
-    | FIXME assuming that LED strips ports are 0x58/0x59 for all boards         |
-    \*-------------------------------------------------------------------------*/
+    /*------------------------------------------------------------------------------------*\
+    | byte order is correct for it5711 though there is more work to do.                    |
+    | For IT5711 defaults to byteorder1/2 for LED strips (Current Behavior is Functional)  |
+    \*------------------------------------------------------------------------------------*/
     uint32_t byteorder;
 
     if(hdr == HDR_D_LED1_RGB)
     {
-        byteorder       = report.byteorder0;
+        byteorder       = report.byteorder1;
     }
     else
     {
-        byteorder       = report.byteorder1;
+        byteorder       = report.byteorder2;
     }
 
     unsigned char bo_r  = byteorder >> 16;
@@ -338,10 +352,14 @@ void RGBFusion2USBController::SetStripColors
     {
         DisableBuiltinEffect(0x01, 0x01);
     }
-    else
+    else if(hdr == HDR_D_LED2_RGB)
     {
         DisableBuiltinEffect(0x02, 0x02);
     }
+    else if(hdr == HDR_D_LED3_RGB)
+    {
+        DisableBuiltinEffect(0x08, 0x08);
+    }
 }
 
 static const std::array< std::array<int, 3>, 5> speeds =
@@ -360,15 +378,57 @@ void RGBFusion2USBController::SetLEDEffect(unsigned int led, int mode, unsigned
     PktEffect pkt;
 
     pkt.Init(led, report_id);
+    /*-------------------------------------------------------------------------*\
+    | Add handling for different parts of the controller                        |
+    | IT8297, IT5702, and IT5711 seems to only support 5 levels of brightness   |
+    \*-------------------------------------------------------------------------*/
+    if(led >= 0x20 && led <= 0x27)
+    {
+        pkt.e.zone0 = static_cast<uint32_t>(1 << (led - 0x20));
+    }
+    else if(led >= 0x90 && led <= 0x92)
+    {
+        pkt.e.zone0 = static_cast<uint32_t>(1 << (led - 0x90));
+    }
+
     pkt.e.effect_type   = mode;
     pkt.e.color0        = r << 16 | g << 8 | b;
 
-    pkt.e.max_brightness = brightness;
+        /*--------------------------------------------------------------------*\
+        | Adjust brightness for 0x20-0x27 and 0x90-0x92                        |
+        | Brightness values supported are as follows:                          |
+        | 0xFF = Max Brightness                                                |
+        | 0xB3 = -1  Brightness                                                |
+        | 0x80 = -2  Brightness                                                |
+        | 0x4D = -3  Brightness                                                |
+        | 0x1a = -4  Brightness                                                |
+        | 0x00 = Min Brightness                                                |
+        \*--------------------------------------------------------------------*/
+        if(brightness == 0)
+            pkt.e.max_brightness = 0x00;
+        else if(brightness == 1)
+            pkt.e.max_brightness = 0x1A;
+        else if(brightness == 2)
+            pkt.e.max_brightness = 0x4D;
+        else if(brightness == 3)
+            pkt.e.max_brightness = 0x80;
+        else if(brightness == 4)
+            pkt.e.max_brightness = 0xB3;
+        else
+            pkt.e.max_brightness = 0xFF;
 
     switch(mode)
     {
         case 0: // Direct
-        case 1: // Static
+        case 1: // Static zero out other effect parameters (IT5711 needs this)
+            pkt.e.period0 = 0;
+            pkt.e.period1 = 0;
+            pkt.e.period2 = 0;
+            pkt.e.period3 = 0;
+            pkt.e.effect_param0 = 0;
+            pkt.e.effect_param1 = 0;
+            pkt.e.effect_param2 = 0;
+            pkt.e.effect_param3 = 0;
             break;
 
         case 2: //Breathing
@@ -397,19 +457,30 @@ void RGBFusion2USBController::SetLEDEffect(unsigned int led, int mode, unsigned
             pkt.e.effect_type   = 3;
             pkt.e.effect_param2 = 2; // flash twice
 
-            if (random)
+            if(random)
             {
                 pkt.e.effect_param0 = 7;
             }
             break;
     }
-
+    /*----------------------------------------*\
+    | Adjust offset formatting for 0x90-0x92   |
+    \*----------------------------------------*/
+    if(led >= 0x90 && led <= 0x92)
+    {
+        pkt.buffer[1] = led;
+        pkt.buffer[2] = 0x00;
+        pkt.buffer[3] = 1 << (led - 0x90);
+    }
     SendPacket(pkt.buffer);
 }
-
+/*--------------------------------------------------*\
+| IT8297 and IT5702 seem happy with sending 0x28FF   |
+| IT5711 needs 0x28FF07 to work properly (?)         |
+\*--------------------------------------------------*/
 bool RGBFusion2USBController::ApplyEffect()
 {
-    return SendPacket(0x28, 0xFF);
+    return SendPacket(0x28, 0xFF, 0x07);
 }
 
 bool RGBFusion2USBController::SendPacket(uint8_t a, uint8_t b, uint8_t c)
@@ -428,3 +499,29 @@ int RGBFusion2USBController::SendPacket(unsigned char* packet)
 {
     return hid_send_feature_report(dev, packet, 64);
 }
+
+/*-----------------------------------------------------------------------------------------*\
+| Init routine to zero out all registers before setting up the controllers.                 |
+| This is required to prevent weird behaviors due to an inconsistent controller state.      |
+\*-----------------------------------------------------------------------------------------*/
+void RGBFusion2USBController::ResetController(uint16_t pid)
+{
+    for(uint8_t reg = 0x20; reg <= 0x27; ++reg)
+        SendPacket(reg, 0x00, 0x00);
+
+    SendPacket(0x32, 0x00, 0x00);
+    SendPacket(0x34, 0x00, 0x00);
+
+    if(pid == 0x5711)
+    {
+        for(uint8_t reg = 0x90; reg <= 0x92; ++reg)
+            SendPacket(reg, 0x00, 0x00);
+    }
+
+    SendPacket(0x28, 0xFF, 0x07);
+}
+
+uint16_t RGBFusion2USBController::GetProductID() const
+{
+    return product_id;
+}

Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.h

@@ -48,10 +48,21 @@ const uint8_t HDR_D_LED2    = LED7;
 const uint8_t HDR_LED_7     = LED8;
 
 /*-------------------------------------------------------------*\
-| FIXME assuming that it is 0x58 for all boards                 |
+| IT8297/IT5702 ARGB Headers                                    |
 \*-------------------------------------------------------------*/
 const uint8_t HDR_D_LED1_RGB = 0x58;
 const uint8_t HDR_D_LED2_RGB = 0x59;
+/*-------------------------------------------------------------*\
+| 0x62 & 0x90-92 found on the new IT5711 controller chip        |
+\*-------------------------------------------------------------*/
+const uint8_t LED9          = 0x90;
+const uint8_t LED10         = 0x91;
+const uint8_t LED11         = 0x92;
+const uint8_t HDR_D_LED3_RGB = 0x62;
+/*------------------------------------------*\
+|Defines new mapping for third argb header   |
+\*------------------------------------------*/
+const uint8_t HDR_D_LED3    = LED8;
 
 enum EffectType
 {
@@ -173,7 +184,7 @@ union PktEffect
 
         e.zone0             = (uint32_t)(1 << (e.header - 32));
         e.effect_type       = EFFECT_STATIC;
-        e.max_brightness    = 100;
+        e.max_brightness    = 255;
         e.min_brightness    = 0;
         e.color0            = 0x00FF2100;   //orange
         e.period0           = 0;            //Rising Timer - Needs to be 0 for "Direct"
@@ -187,6 +198,17 @@ union PktEffect
     }
 };
 
+/*--------------------------------------------------------------------------------------*\
+| Definitions for Initial controller response struct.                                    |
+| curr_led_count_high and curr_led_count_low contain the numbers of leds in each header. |
+| Byte orders are little endian little-endian 0x00RRGGBB?                                |
+| byteorder0 is location of "Spare" calibration location.                                |
+| byteorder1 is location of "D_LED1" calibration location.                               |
+| byteorder2 is location of "D_LED2/D_LED3" calibration location.                        |
+| byteorder3 is location of "Mainboard" calibration location.                            |
+| byteorder4 is location of fifth calibration location.                                  |
+| *Note that the calibration locations aren't fully understood yet for the IT5711.       |
+\*--------------------------------------------------------------------------------------*/
 struct IT8297Report
 {
     uint8_t report_id;
@@ -194,14 +216,16 @@ struct IT8297Report
     uint8_t device_num;
     uint8_t total_leds;
     uint32_t fw_ver;
-    uint16_t curr_led_count;
+    uint8_t curr_led_count_high;
+    uint8_t curr_led_count_low;
     uint16_t reserved0;
-    char str_product[32];           // might be 28 and an extra byteorder3
-    uint32_t byteorder0;            // is little-endian 0x00RRGGBB ?
+    char str_product[28];
+    uint32_t byteorder0;
     uint32_t byteorder1;
     uint32_t byteorder2;
+    uint32_t byteorder3;
     uint32_t chip_id;
-    uint32_t reserved1;
+    uint32_t byteorder4;
 };
 
 #pragma pack(pop)
@@ -209,7 +233,7 @@ struct IT8297Report
 class RGBFusion2USBController
 {
 public:
-    RGBFusion2USBController(hid_device* handle, const char *path, std::string mb_name);
+    RGBFusion2USBController(hid_device* handle, const char *path, std::string mb_name, uint16_t pid);
     ~RGBFusion2USBController();
 
     void            SetStripColors
@@ -220,6 +244,8 @@ public:
                         int             single_led      = -1
                         );
 
+    void            ResetController(uint16_t pid);
+    uint16_t        GetProductID() const;
     void            SetLEDEffect(unsigned int led, int mode, unsigned int speed, unsigned char brightness, bool random, unsigned char red, unsigned char green, unsigned char blue);
     void            SetLedCount(unsigned int led, unsigned int count);
     void            SetMode(int mode);
@@ -240,6 +266,7 @@ private:
     void            SetCalibrationBuffer(std::string rgb_order, uint8_t* buffer, uint8_t offset);
 
     hid_device*             dev;
+    uint16_t                product_id;
     int                     mode;
     IT8297Report            report;
     std::string             name;
@@ -251,4 +278,5 @@ private:
     int                     report_id = 0xCC;
     LEDCount                D_LED1_count;
     LEDCount                D_LED2_count;
-};
+    LEDCount                D_LED3_count;   //Third ARGB header count
+};

Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBControllerDetect.cpp

@@ -37,7 +37,7 @@ void DetectGigabyteRGBFusion2USBControllers(hid_device_info* info, const std::st
 
     if(dev)
     {
-        RGBFusion2USBController*     controller     = new RGBFusion2USBController(dev, info->path, MB_info.getMainboard());
+        RGBFusion2USBController*     controller     = new RGBFusion2USBController(dev, info->path, MB_info.getMainboard(), info->product_id);
         RGBController_RGBFusion2USB* rgb_controller = new RGBController_RGBFusion2USB(controller, DETECTOR_NAME);
         // Constructor sets the name
         ResourceManager::get()->RegisterRGBController(rgb_controller);
@@ -47,8 +47,10 @@ void DetectGigabyteRGBFusion2USBControllers(hid_device_info* info, const std::st
 #ifdef USE_HID_USAGE
 REGISTER_HID_DETECTOR_PU(DETECTOR_NAME, DetectGigabyteRGBFusion2USBControllers, IT8297_VID, 0x8297, IT8297_UPG, IT8297_U);
 REGISTER_HID_DETECTOR_PU(DETECTOR_NAME, DetectGigabyteRGBFusion2USBControllers, IT8297_VID, 0x5702, IT8297_UPG, IT8297_U);
+REGISTER_HID_DETECTOR_PU(DETECTOR_NAME, DetectGigabyteRGBFusion2USBControllers, IT8297_VID, 0x5711, IT8297_UPG, IT8297_U);
 #else
 REGISTER_HID_DETECTOR_I(DETECTOR_NAME, DetectGigabyteRGBFusion2USBControllers, IT8297_VID, 0x8297, IT8297_IFC);
 REGISTER_HID_DETECTOR_I(DETECTOR_NAME, DetectGigabyteRGBFusion2USBControllers, IT8297_VID, 0x5702, IT8297_IFC);
+REGISTER_HID_DETECTOR_I(DETECTOR_NAME, DetectGigabyteRGBFusion2USBControllers, IT8297_VID, 0x5711, IT8297_IFC);
 #endif
 

Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp

@@ -21,9 +21,10 @@
 \*-------------------------------------------------*/
 static FwdLedHeaders LedLookup
 {
-    {"LED1",   0x20}, {"LED2",   0x21}, {"LED3", 0x22}, {"LED4", 0x23},
-    {"LED5",   0x24}, {"LED6",   0x25}, {"LED7", 0x26}, {"LED8", 0x27},
-    {"D_LED1", 0x58}, {"D_LED2", 0x59},
+    {"LED1",   0x20}, {"LED2",   0x21}, {"LED3", 0x22},     {"LED4", 0x23},
+    {"LED5",   0x24}, {"LED6",   0x25}, {"LED7", 0x26},     {"LED8", 0x27},
+    {"D_LED1", 0x58}, {"D_LED2", 0x59}, {"D_LED3", 0x62},   {"LED9", 0x90},
+    {"LED10", 0x91},  {"LED11", 0x92},
 };
 
 /*-------------------------------------------------*\
@@ -32,25 +33,39 @@ static FwdLedHeaders LedLookup
 \*-------------------------------------------------*/
 static MBName MBName2LayoutLookup
 {
-    {"B550 AORUS ELITE",            "STD_ATX"   },
-    {"B550 AORUS PRO",              "STD_ATX"   },
-    {"B550I AORUS PRO AX",          "ITX"       },
-    {"X570 AORUS ELITE",            "STD_ATX"   },
-    {"X570 AORUS MASTER",           "MSTR_ATX_3"},
-    {"X570 AORUS PRO",              "STD_ATX"   },
-    {"X570 AORUS ELITE WIFI",       "STD_ATX"   },
-    {"X570 AORUS PRO WIFI",         "STD_ATX"   },
-    {"X570 AORUS ULTRA",            "STD_ATX"   },
-    {"X570 I AORUS PRO WIFI",       "ITX"       },
-    {"X670E AORUS MASTER",          "MSTR_ATX_2"},
-    {"Z390 AORUS MASTER-CF",        "MSTR_ATX"  },
+    {"B550 AORUS ELITE",                    "STD_ATX" },
+    {"B550 AORUS PRO",                      "STD_ATX" },
+    {"B550I AORUS PRO AX",                      "ITX" },
+    {"B650 EAGLE AX",                 "B650-Eagle-AX" },
+    {"B650E AORUS STEALTH",     "B650E-AORUS-STEALTH" },
+    {"B650E AORUS STEALTH ICE", "B650E-AORUS-STEALTH" },
+    {"B650M DS3H",                       "B650M-DS3H" },
+    {"B850 AORUS ELITE WIFI7",           "X870-WIFI7" },
+    {"B850 AORUS ELITE WIFI7 ICE",       "X870-WIFI7" },
+    {"X570 AORUS ELITE",                    "STD_ATX" },
+    {"X570 AORUS ELITE WIFI",               "STD_ATX" },
+    {"X570 AORUS MASTER",                "MSTR_ATX_3" },
+    {"X570 AORUS PRO",                      "STD_ATX" },
+    {"X570 AORUS PRO WIFI",                 "STD_ATX" },
+    {"X570 AORUS ULTRA",                    "STD_ATX" },
+    {"X570 I AORUS PRO WIFI",                   "ITX" },
+    {"X670E AORUS MASTER",               "MSTR_ATX_2" },
+    {"X870 AORUS ELITE WIFI7",           "X870-WIFI7" },
+    {"X870 AORUS ELITE WIFI7 ICE",       "X870-WIFI7" },
+    {"X870E AORUS ELITE WIFI7",         "X870E-WIFI7" },
+    {"X870E AORUS ELITE WIFI7 ICE",     "X870E-WIFI7" },
+    {"X870E AORUS PRO",                   "X870E-PRO" },
+    {"X870E AORUS PRO ICE",               "X870E-PRO" },
+    {"Z390 AORUS MASTER-CF",               "MSTR_ATX" },
+    {"Z890 AORUS ELITE WIFI7",           "Z890-WIFI7" },
+    {"Z890 AORUS ELITE WIFI7 ICE",       "Z890-WIFI7" }
 };
 
 /*-------------------------------------------------*\
 | This is the default Custom layout that will be    |
 | written into config if it doesn't exist           |
 \*-------------------------------------------------*/
-static const KnownLayout HardcodedCustom
+static const KnownLayout HardcodedCustom_Gen1
 {
     {
         "Custom",
@@ -58,12 +73,12 @@ static const KnownLayout HardcodedCustom
             {
                 "Motherboard",
                 {
-                    { "Name for Led 1", LED1, 1 },
-                    { "Name for Led 2", LED2, 1 },
-                    { "Name for Led 3", LED3, 1 },
-                    { "Name for Led 4", LED4, 1 },
-                    { "Name for Led 5", LED5, 1 },
-                    { "Name for Led 8", LED8, 1 },
+                    { "Name for Led 1",     LED1, 1 },
+                    { "Name for Led 2",     LED2, 1 },
+                    { "Name for Led 3",     LED3, 1 },
+                    { "Name for Led 4",     LED4, 1 },
+                    { "Name for Led 5",     LED5, 1 },
+                    { "Name for Led 8",     LED8, 1 },
                 }
             },
             {
@@ -82,6 +97,47 @@ static const KnownLayout HardcodedCustom
     }
 };
 
+static const KnownLayout HardcodedCustom_Gen2
+{
+    {
+        "Custom",
+        {
+            {
+                "Motherboard",
+                {
+                    { "0x20",                   LED1, 1 }, //This one should apply everything globally (testing needed).
+                    { "0x21",                   LED2, 1 },
+                    { "0x22",                   LED3, 1 }, //Confirmed accent Lighting for X870 Aorus Elite Boards.
+                    { "0x23",                   LED4, 1 },
+                    { "0x24",                   LED5, 1 }, //should be LED_C on most if not all models.
+                    { "0x90",                   LED9, 1 },
+                    { "0x91",                   LED10, 1 },//Should be logo on pro models.
+                    { "0x92",                   LED11, 1 },//Should be accent on pro models.
+                }
+            },
+                {
+                "ARGB V2.3",
+                {
+                    { "ARGB V2.3", HDR_D_LED3, 0 },
+                }
+            },
+            {
+                "ARGB V2.1",
+                {
+                    { "ARGB V2.1", HDR_D_LED1, 0 },
+                }
+            },
+            {
+                "ARGB V2.2",
+                {
+                    { "ARGB V2.2", HDR_D_LED2, 0 },
+                }
+            }
+        }
+    },
+};
+
+
 /*-------------------------------------------------*\
 | KnownLayoutsLookup now needs to be variable to    |
 | allow for a custom addition from config           |
@@ -89,7 +145,366 @@ static const KnownLayout HardcodedCustom
 static KnownLayout knownLayoutsLookup
 {
     {
-        "IT8297BX-GBX570",    //Left as a catch all
+        "STD_ATX",
+        {
+            {
+                "Motherboard",
+                {
+                    { "Back I/O",   HDR_BACK_IO, 1 },
+                    { "CPU Header", HDR_CPU, 1 },
+                    { "PCIe",       HDR_PCIE, 1 },
+                    { "LED C1/C2",  HDR_LED_C1C2, 1 },
+                }
+            },
+            {
+                "D_LED1 Bottom",
+                {
+                    { "D_LED1 Bottom", HDR_D_LED1, 0 },
+                }
+            },
+            {
+                "D_LED2 Top",
+                {
+                    { "D_LED2 Top", HDR_D_LED2, 0 },
+                }
+            }
+        }
+    },
+    {
+        "ITX",
+        {
+            {
+                "Motherboard",
+                {
+                    { "LED Group0", HDR_BACK_IO, 1 },
+                    { "LED Group1", HDR_CPU, 1 },
+                    { "LED Group2", HDR_LED_2, 1 },
+                    { "LED Group3", HDR_PCIE, 1 },
+                    { "LED C1/C2",  HDR_LED_C1C2, 1 },
+                }
+            },
+            {
+                "D_LED1",
+                {
+                    { "D_LED1", HDR_D_LED1, 0 },
+                }
+            }
+        }
+    },
+    {
+        "B650-Eagle-AX",
+        {
+            {
+                "Motherboard",
+                {
+                    { "LED_C",          LED5, 1 },
+                }
+            },
+            {
+                "ARGB V2.3",
+                {
+                    { "ARGB V2.3", HDR_D_LED3, 0 },
+                }
+            },
+            {
+                "ARGB V2.1",
+                {
+                    { "ARGB V2.1", HDR_D_LED1, 0 },
+                }
+            },
+            {
+                "ARGB V2.2",
+                {
+                    { "ARGB V2.2", HDR_D_LED2, 0 },
+                }
+            }
+        }
+    },
+    {
+        "B650E-AORUS-STEALTH",
+        {
+            {
+                "Motherboard",
+                {
+                    { "Logo",           LED10, 1 },
+                    { "Accent",         LED11, 1 },
+                    { "LED C",           LED5, 1 },
+                }
+            },
+            {
+                "ARGB V2.1",
+                {
+                    { "ARGB V2.1", HDR_D_LED1, 0 },
+                }
+            },
+            {
+                "ARGB V2.2",
+                {
+                    { "ARGB V2.2", HDR_D_LED2, 0 },
+                }
+            }
+        }
+    },
+    {
+        "B650M-DS3H",
+        {
+            {
+                "Motherboard",
+                {
+                    { "LED_C",           LED5, 1 },
+                }
+            },
+            {
+                "D_LED1",
+                {
+                    { "D_LED1", HDR_D_LED1, 0 },
+                }
+            },
+            {
+                "D_LED2",
+                {
+                    { "D_LED2", HDR_D_LED1, 0 },
+                }
+            }
+        }
+    },
+    {
+        "X870-WIFI7",
+        {
+            {
+                "Motherboard",
+                {
+                    { "Accent",        LED3, 1 },
+                    { "LED C",         LED5, 1 },
+                }
+            },
+            {
+                "ARGB V2.3",
+                {
+                    { "ARGB V2.3", HDR_D_LED3, 0 },
+                }
+            },
+            {
+                "ARGB V2.1",
+                {
+                    { "ARGB V2.1", HDR_D_LED1, 0 },
+                }
+            },
+            {
+                "ARGB V2.2",
+                {
+                    { "ARGB V2.2", HDR_D_LED2, 0 },
+                }
+            }
+        }
+    },
+    {
+        "X870E-WIFI7",
+        {
+            {
+                "Motherboard",
+                {
+                    { "Accent",         LED11, 1 },
+                    { "LED C",           LED5, 1 },
+                }
+            },
+            {
+                "ARGB V2.3",
+                {
+                    { "ARGB V2.3", HDR_D_LED3, 0 },
+                }
+            },
+            {
+                "ARGB V2.1",
+                {
+                    { "ARGB V2.1", HDR_D_LED1, 0 },
+                }
+            },
+            {
+                "ARGB V2.2",
+                {
+                    { "ARGB V2.2", HDR_D_LED2, 0 },
+                }
+            }
+        }
+    },
+    {
+        "X870E-PRO",
+        {
+            {
+                "Motherboard",
+                {
+                    { "Logo",           LED10, 1 },
+                    { "Accent",         LED11, 1 },
+                    { "LED C",           LED5, 1 },
+                }
+            },
+            {
+                "ARGB V2.3",
+                {
+                    { "ARGB V2.3", HDR_D_LED3, 0 },
+                }
+            },
+            {
+                "ARGB V2.1",
+                {
+                    { "ARGB V2.1", HDR_D_LED1, 0 },
+                }
+            },
+            {
+                "ARGB V2.2",
+                {
+                    { "ARGB V2.2", HDR_D_LED2, 0 },
+                }
+            }
+        }
+    },
+    {
+        "MSTR_ATX_2",
+        {
+            {
+                "D_LED1 Bottom",
+                {
+                    { "D_LED1 Bottom", HDR_D_LED2, 0 },
+                }
+            },
+            {
+                "D_LED2 Top",
+                {
+                    { "D_LED2 Top",  HDR_D_LED1, 0 },
+                }
+            },
+            {
+                "Motherboard",
+                {
+                    { "LED C1",         LED2, 1 },
+                    { "LED C2",         LED5, 1 },
+                    { "CPU Header",     LED3, 1 },
+                    { "Cover Left",     LED4, 1 },
+                    { "Cover Right",    LED1, 1 },
+                }
+            }
+        }
+    },
+    {
+        "MSTR_ATX_3",
+        {
+            {
+                "Digital Headers",
+                {
+                    { "D_LED1 / D_LED2", HDR_D_LED1, 0 },
+                }
+            },
+            {
+                "ARGB Strip",
+                {
+                    { "LED C1/C2",  LED5, 1 },
+                }
+            },
+            {
+                "Motherboard",
+                {
+                    { "Aorus Logo", LED7, 1 },
+                    { "ESS Logo",   LED4, 1 },
+                }
+            }
+        }
+    },
+    {
+        "MSTR_ATX",
+        {
+            {
+                "Digital Headers",
+                {
+                    { "D_LED1 / D_LED2", LED6, 0 },
+                }
+            },
+            {
+                "ARGB Strip",
+                {
+                    { "Back IO / VRM",  LED7, 0 },
+                }
+            },
+            {
+                "Motherboard",
+                {
+                    { "XMP Logo",       LED2, 1 },
+                    { "Chipset Logo",   LED3, 1 },
+                    { "PCIe",           LED4, 1 },
+                    { "LED C1/C2",      LED5, 1 },
+                }
+            }
+        }
+    },
+    {
+        "Z890-WIFI7",
+        {
+            {
+                "Motherboard",
+                {
+                    { "Logo",           LED10, 1 },
+                    { "Accent",          LED3, 1 },
+                    { "LED C",           LED5, 1 },
+                }
+            },
+            {
+                "ARGB V2.3",
+                {
+                    { "ARGB V2.3", HDR_D_LED3, 0 },
+                }
+            },
+            {
+                "ARGB V2.1",
+                {
+                    { "ARGB V2.1", HDR_D_LED1, 0 },
+                }
+            },
+            {
+                "ARGB V2.2",
+                {
+                    { "ARGB V2.2", HDR_D_LED2, 0 },
+                }
+            }
+        }
+    },
+    {
+        "IT5711-Generic",
+        {
+            {
+                "Motherboard",
+                {
+                    { "0x20",          LED1, 1 },
+                    { "Ox21",          LED2, 1 },
+                    { "0x22",          LED3, 1 },
+                    { "0x23",          LED4, 1 },
+                    { "0x24",          LED5, 1 },
+                    { "0x90",          LED9, 1 },
+                    { "0x91",          LED10, 1 },
+                    { "0x92",          LED11, 1 },
+                }
+            },
+            {
+                "ARGB V2.3",
+                {
+                    { "ARGB V2.3", HDR_D_LED3, 0 },
+                }
+            },
+            {
+                "ARGB V2.1",
+                {
+                    { "ARGB V2.1", HDR_D_LED1, 0 },
+                }
+            },
+            {
+                "ARGB V2.2",
+                {
+                    { "ARGB V2.2", HDR_D_LED2, 0 },
+                }
+            }
+        }
+    },
+    {
+        "IT8297BX-GBX570",
         {
             {
                 "Motherboard",
@@ -117,133 +532,10 @@ static KnownLayout knownLayoutsLookup
                 }
             }
         }
-    },
-    {
-        "STD_ATX",
-        {
-            {
-                "Motherboard",
-                {
-                    { "Back I/O",   HDR_BACK_IO, 1 },
-                    { "CPU Header", HDR_CPU, 1 },
-                    { "PCIe",       HDR_PCIE, 1},
-                    { "LED C1/C2",  HDR_LED_C1C2, 1 }, // 12VGRB headers seem to be connected
-                }
-            },
-            {
-                "D_LED1 Bottom",
-                {
-                    { "D_LED1 Bottom", HDR_D_LED1, 0 },
-                }
-            },
-            {
-                "D_LED2 Top",
-                {
-                    { "D_LED2 Top", HDR_D_LED2, 0 },
-                }
-            }
-        }
-    },
-    {
-        "ITX",
-        {
-            {
-                "Motherboard",
-                {
-                    { "LED Group0", HDR_BACK_IO, 1 },
-                    { "LED Group1", HDR_CPU, 1 },
-                    { "LED Group2", HDR_LED_2, 1 },
-                    { "LED Group3", HDR_PCIE, 1 },
-                    { "LED C1/C2",  HDR_LED_C1C2, 1 }, // 12VGRB headers seem to be connected
-                }
-            },
-            {
-                "D_LED1",
-                {
-                    { "D_LED1", HDR_D_LED1, 0 },
-                }
-            }
-        }
-    },
-    {
-        "MSTR_ATX",
-        {
-            {
-                "Digital Headers",
-                {
-                    { "D_LED1 / D_LED2", LED6, 0},
-                }
-            },
-            {
-                "ARGB Strip",
-                {
-                    { "Back IO / VRM",  LED7, 0},
-                }
-            },
-            {
-                "Motherboard",
-                {
-                    { "XMP Logo",       LED2, 1},
-                    { "Chipset Logo",   LED3, 1},
-                    { "PCIe",           LED4, 1},
-                    { "LED C1/C2",      LED5, 1},
-                }
-            }
-        }
-    },
-    {
-        "MSTR_ATX_2",
-        {
-            {
-                "D_LED1 Bottom",
-                {
-                    { "D_LED1 Bottom", HDR_D_LED2, 0},
-                }
-            },
-            {
-                "D_LED2 Top",
-                {
-                    { "D_LED2 Top",  HDR_D_LED1, 0},
-                }
-            },
-            {
-                "Motherboard",
-                {
-                    { "LED C1",         LED2, 1},
-                    { "LED C2",         LED5, 1},
-                    { "CPU Header",     LED3, 1},
-                    { "Cover Left",     LED4, 1},
-                    { "Cover Right",    LED1, 1},
-                }
-            }
-        }
-    },
-    {
-        "MSTR_ATX_3",
-        {
-            {
-                "Digital Headers",
-                {
-                    { "D_LED1 / D_LED2", HDR_D_LED1, 0},
-                }
-            },
-            {
-                "ARGB Strip",
-                {
-                    { "LED C1/C2",  LED5, 1},
-                }
-            },
-            {
-                "Motherboard",
-                {
-                    { "Aorus Logo", LED7, 1},
-                    { "ESS Logo",   LED4, 1},
-                }
-            }
-        }
-    },
+    }
 };
 
+
 /**------------------------------------------------------------------*\
     @name Gigabyte RGB Fusion 2 USB
     @category Motherboard
@@ -392,9 +684,20 @@ void RGBController_RGBFusion2USB::Load_Device_Config()
     }
 
     /*-------------------------------------------------*\
-    | Get Custom Layout from the settings manager       |
+    | Get Custom Layout from the settings manager.      |
+    | Selects appropriate layout based on controller.   |
     \*-------------------------------------------------*/
-    layout = HardcodedCustom.find("Custom")->second;
+    uint16_t pid = controller->GetProductID();
+
+    if(pid == 0x5711)
+    {
+        layout = HardcodedCustom_Gen2.find("Custom")->second;
+    }
+    else
+    {
+        layout = HardcodedCustom_Gen1.find("Custom")->second;
+    }
+
     if (!device_settings.contains(SectionCustom))
     {
         /*---------------------------------------------*\
@@ -454,7 +757,10 @@ void RGBController_RGBFusion2USB::Load_Device_Config()
                     \*---------------------------------*/
                     lp.name         = json_vlp["name"].get<std::string>();
                     lp.header       = LedLookup.find(json_vlp["header"].get<std::string>())->second;
-                    lp.count        = ((lp.header == LED6) || (lp.header == LED7)) ? 0 : 1;
+                    if(lp.header == HDR_D_LED1 || lp.header == HDR_D_LED2 || lp.header == HDR_D_LED3)
+                        lp.count = 0;
+                    else
+                        lp.count = 1;
                     v_lp.push_back(lp);
                 }
 
@@ -469,7 +775,7 @@ void RGBController_RGBFusion2USB::Init_Controller()
     /*---------------------------------------------------------*\
     | Look up channel map based on device name                  |
     \*---------------------------------------------------------*/
-    if (!custom_layout)
+    if(!custom_layout)
     {
         /*-----------------------------------------------------*\
         | If the layout is custom then it's loaded and ready,   |
@@ -482,7 +788,24 @@ void RGBController_RGBFusion2USB::Init_Controller()
         }
         else
         {
-            layout = knownLayoutsLookup.find("IT8297BX-GBX570")->second;
+            uint16_t pid = controller->GetProductID();
+            std::string fallback_layout;
+
+            switch(pid)
+            {
+                case 0x5711:
+                    fallback_layout = "IT5711-Generic";
+                    break;
+                case 0x5702:
+                    fallback_layout = "STD_ATX";
+                    break;
+                case 0x8297:
+                    fallback_layout = "STD_ATX";
+                    break;
+                default:
+                    fallback_layout = "IT5711-Generic";  // safest default
+                    break;
+            }
         }
     }
 
@@ -659,8 +982,25 @@ void RGBController_RGBFusion2USB::UpdateZoneLEDs(int zone)
             \*---------------------------------------------------------*/
             if(mode_value == 0xFFFF)
             {
-                hdr += RGBFusion2_Digital_Direct_Offset;
-                controller->DisableBuiltinEffect(1, ((hdr == HDR_D_LED1_RGB) ? 0x01 : 0x02));
+                //Updated: Proper RGB register mapping for each header
+                switch(hdr)
+                {
+                    case HDR_D_LED1:
+                        hdr = HDR_D_LED1_RGB;
+                        controller->DisableBuiltinEffect(1, 0x01);
+                        break;
+                    case HDR_D_LED2:
+                        hdr = HDR_D_LED2_RGB;
+                        controller->DisableBuiltinEffect(1, 0x02);
+                        break;
+                    case HDR_D_LED3:
+                        hdr = HDR_D_LED3_RGB;
+                        controller->DisableBuiltinEffect(1, 0x08);
+                        break;
+                    default:
+                        break;
+                }
+
                 controller->SetStripColors(hdr, zones[zone].colors, zones[zone].leds_count);
             }
             /*---------------------------------------------------------*\
@@ -685,8 +1025,23 @@ void RGBController_RGBFusion2USB::UpdateZoneLEDs(int zone)
                 /*---------------------------------------------------------*\
                 | Apply built-in effects to LED strips                      |
                 \*---------------------------------------------------------*/
-                controller->DisableBuiltinEffect(0, hdr == HDR_D_LED1 ? 0x01 : 0x02);
-                controller->SetLEDEffect(hdr, modes[active_mode].value, modes[active_mode].speed, modes[active_mode].brightness, random, red, grn, blu);
+
+                switch(hdr)
+                {
+                    case HDR_D_LED1:
+                        controller->DisableBuiltinEffect(0, 0x01);
+                        break;
+                    case HDR_D_LED2:
+                        controller->DisableBuiltinEffect(0, 0x02);
+                        break;
+                    case HDR_D_LED3:
+                        controller->DisableBuiltinEffect(0, 0x08);
+                        break;
+                    default:
+                    break;
+                }
+
+                controller->SetLEDEffect(hdr, mode_value, modes[active_mode].speed, modes[active_mode].brightness, random, red, grn, blu);
                 controller->ApplyEffect();
             }
         }
@@ -767,4 +1122,4 @@ int RGBController_RGBFusion2USB::GetLED_Zone(int led_idx)
     | If zone is not found, return -1   |
     \*---------------------------------*/
     return(-1);
-}
+}

Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.h

@@ -20,8 +20,7 @@
 #define RGBFusion2_Digital_LEDS_Min         0;
 #define RGBFusion2_Digital_LEDS_Max         1024;
 #define RGBFUSION2_BRIGHTNESS_MIN           0;
-#define RGBFUSION2_BRIGHTNESS_MAX           100;
-#define RGBFusion2_Digital_Direct_Offset    (HDR_D_LED1_RGB - HDR_D_LED1);
+#define RGBFUSION2_BRIGHTNESS_MAX           5;
 
 template<typename K, typename V>
 static std::map<V, K> reverse_map(const std::map<K, V>& map)

Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUControllerDetect.cpp

@@ -140,6 +140,7 @@ REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 2060 SUPER Gaming OC",
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 2060 SUPER Gaming OC 3X White",      DetectGigabyteRGBFusionGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2060S_OC_DEV,     GIGABYTE_SUB_VEN,   GIGABYTE_RTX2060S_GAMING_OC_WHITE_SUB_DEV,      0x47);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 2060 SUPER Gaming OC 3X V2",         DetectGigabyteRGBFusionGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2060S_OC_DEV,     GIGABYTE_SUB_VEN,   GIGABYTE_RTX2060S_GAMING_OC_3X_V2_SUB_DEV,      0x47);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 2070 Gaming OC",                     DetectGigabyteRGBFusionGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2070_DEV,         GIGABYTE_SUB_VEN,   GIGABYTE_RTX2070_GAMING_OC_SUB_DEV,             0x47);
+REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 2070 Gaming OC",                     DetectGigabyteRGBFusionGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2070_OC_DEV,      GIGABYTE_SUB_VEN,   GIGABYTE_RTX2070_GAMING_OC_SUB_DEV,             0x47);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 2070 Gaming OC 8GC",                 DetectGigabyteRGBFusionGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2070_DEV,         GIGABYTE_SUB_VEN,   GIGABYTE_RTX2070_GAMING_OC_8GC_SUB_DEV,         0x47);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 2070 Windforce",                     DetectGigabyteRGBFusionGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2070_DEV,         GIGABYTE_SUB_VEN,   GIGABYTE_RTX2070_WINDFORCE_SUB_DEV,             0x47);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 2070 SUPER Gaming OC",               DetectGigabyteRGBFusionGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2070S_OC_DEV,     GIGABYTE_SUB_VEN,   GIGABYTE_RTX2070S_GAMING_OC_SUB_DEV,            0x47);
@@ -148,7 +149,7 @@ REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 2070 SUPER Gaming OC 3X",
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 2070 SUPER Gaming OC 3X White",      DetectGigabyteRGBFusionGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2070S_OC_DEV,     GIGABYTE_SUB_VEN,   GIGABYTE_RTX2070S_GAMING_OC_3X_WHITE_SUB_DEV,   0x47);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 2080 Gaming OC",                     DetectGigabyteRGBFusionGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2080_DEV,         GIGABYTE_SUB_VEN,   GIGABYTE_RTX2080_GAMING_OC_SUB_DEV,             0x47);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 2080 Gaming OC",                     DetectGigabyteRGBFusionGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2080_A_DEV,       GIGABYTE_SUB_VEN,   GIGABYTE_RTX2080_A_GAMING_OC_SUB_DEV,           0x47);
-REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 2080 Ti GAMING OC",                  DetectGigabyteRGBFusionGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2080TI_A_DEV,     GIGABYTE_SUB_VEN,   GIGABYTE_RTX2080_TI_GAMING_OC_SUB_DEV,          0x47);
+REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 2080 Ti GAMING OC",                  DetectGigabyteRGBFusionGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2080TI_A_DEV,     GIGABYTE_SUB_VEN,   GIGABYTE_RTX2080TI_GAMING_OC_SUB_DEV,           0x47);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 2080 SUPER Gaming OC",               DetectGigabyteRGBFusionGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2080S_DEV,        GIGABYTE_SUB_VEN,   GIGABYTE_RTX2080S_GAMING_OC_SUB_DEV,            0x47);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 3050 Gaming OC",                     DetectGigabyteRGBFusionGPUControllers,  NVIDIA_VEN, NVIDIA_RTX3050_DEV,         GIGABYTE_SUB_VEN,   GIGABYTE_RTX3050_GAMING_OC_8GB_SUB_DEV,         0x62);
 REGISTER_I2C_PCI_DETECTOR("Gigabyte GeForce RTX 3060 EAGLE OC",                      DetectGigabyteRGBFusionGPUControllers,  NVIDIA_VEN, NVIDIA_RTX3060_DEV,         GIGABYTE_SUB_VEN,   GIGABYTE_RTX3060_EAGLE_OC_12GB_SUB_DEV,         0x63);

Controllers/GoveeController/GoveeController.cpp

@@ -0,0 +1,321 @@
+/*---------------------------------------------------------*\
+| GoveeController.cpp                                       |
+|                                                           |
+|   Driver for Govee wireless lighting devices              |
+|                                                           |
+|   Adam Honse ([email protected])      01 Dec 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include <nlohmann/json.hpp>
+#include "base64.hpp"
+#include "GoveeController.h"
+
+using json = nlohmann::json;
+using namespace std::chrono_literals;
+
+base64::byte CalculateXorChecksum(std::vector<base64::byte> packet)
+{
+    base64::byte checksum = 0;
+
+    for(unsigned int i = 0; i < packet.size(); i++)
+    {
+        checksum ^= packet[i];
+    }
+
+    return(checksum);
+}
+
+GoveeController::GoveeController(std::string ip)
+{
+    /*-----------------------------------------------------*\
+    | Fill in location string with device's IP address      |
+    \*-----------------------------------------------------*/
+    ip_address  = ip;
+
+    /*-----------------------------------------------------*\
+    | Register callback for receiving broadcasts            |
+    \*-----------------------------------------------------*/
+    RegisterReceiveBroadcastCallback(this);
+
+    broadcast_received = false;
+
+    /*-----------------------------------------------------*\
+    | Request device information                            |
+    \*-----------------------------------------------------*/
+    SendScan();
+
+    /*-----------------------------------------------------*\
+    | Wait up to 5s for device information to be received   |
+    \*-----------------------------------------------------*/
+    for(unsigned int wait_count = 0; wait_count < 500; wait_count++)
+    {
+        if(broadcast_received)
+        {
+            break;
+        }
+
+        std::this_thread::sleep_for(10ms);
+    }
+
+    /*-----------------------------------------------------*\
+    | Open a UDP client sending to the Govee device IP,     |
+    | port 4003                                             |
+    \*-----------------------------------------------------*/
+    port.udp_client(ip_address.c_str(), "4003");
+}
+
+GoveeController::~GoveeController()
+{
+    UnregisterReceiveBroadcastCallback(this);
+}
+
+std::string GoveeController::GetLocation()
+{
+    return("IP: " + ip_address);
+}
+
+std::string GoveeController::GetSku()
+{
+    return(sku);
+}
+
+std::string GoveeController::GetVersion()
+{
+    return("BLE Hardware Version: "  + bleVersionHard  + "\r\n" +
+           "BLE Software Version: "  + bleVersionSoft  + "\r\n" +
+           "WiFi Hardware Version: " + wifiVersionHard + "\r\n" +
+           "WiFI Software Version: " + wifiVersionSoft + "\r\n");
+}
+
+void GoveeController::ReceiveBroadcast(char* recv_buf, int size)
+{
+    if(broadcast_received)
+    {
+        return;
+    }
+
+    /*-----------------------------------------------------*\
+    | Responses are not null-terminated, so add termination |
+    \*-----------------------------------------------------*/
+    recv_buf[size] = '\0';
+
+    /*-----------------------------------------------------*\
+    | Convert null-terminated response to JSON              |
+    \*-----------------------------------------------------*/
+    json response = json::parse(recv_buf);
+
+    /*-----------------------------------------------------*\
+    | Check if the response contains the method name        |
+    \*-----------------------------------------------------*/
+    if(response.contains("msg"))
+    {
+        /*-------------------------------------------------*\
+        | Handle responses for scan command                 |
+        | This command's response should contain a msg      |
+        | object containing a data member with ip, device,  |
+        | sku, among others.                                |
+        \*-------------------------------------------------*/
+        if(response["msg"].contains("cmd"))
+        {
+            if(response["msg"]["cmd"] == "scan")
+            {
+                if(response["msg"].contains("data"))
+                {
+                    if(response["msg"]["data"].contains("ip"))
+                    {
+                        if(response["msg"]["data"]["ip"] == ip_address)
+                        {
+                            if(response["msg"]["data"].contains("sku"))
+                            {
+                                sku = response["msg"]["data"]["sku"];
+                            }
+
+                            if(response["msg"]["data"].contains("bleVersionHard"))
+                            {
+                                bleVersionHard = response["msg"]["data"]["bleVersionHard"];
+                            }
+
+                            if(response["msg"]["data"].contains("bleVersionSoft"))
+                            {
+                                bleVersionSoft = response["msg"]["data"]["bleVersionSoft"];
+                            }
+
+                            if(response["msg"]["data"].contains("wifiVersionHard"))
+                            {
+                                wifiVersionHard = response["msg"]["data"]["wifiVersionHard"];
+                            }
+
+                            if(response["msg"]["data"].contains("wifiVersionSoft"))
+                            {
+                                wifiVersionSoft = response["msg"]["data"]["wifiVersionSoft"];
+                            }
+
+                            broadcast_received = true;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+void GoveeController::SetColor(unsigned char red, unsigned char green, unsigned char blue, unsigned char brightness)
+{
+    json command;
+
+    command["msg"]["cmd"]                       = "colorwc";
+    command["msg"]["data"]["color"]["r"]        = red;
+    command["msg"]["data"]["color"]["g"]        = green;
+    command["msg"]["data"]["color"]["b"]        = blue;
+    command["msg"]["data"]["colorTemInKelvin"]  = "0";
+
+    /*-----------------------------------------------------*\
+    | Convert the JSON object to a string and write it      |
+    \*-----------------------------------------------------*/
+    std::string command_str                     = command.dump();
+
+    port.udp_write((char *)command_str.c_str(), command_str.length() + 1);
+}
+
+void GoveeController::SendRazerData(RGBColor* colors, unsigned int size)
+{
+    std::vector<base64::byte> pkt = { 0xBB, 0x00, 0x00, 0xB0, 0x00, 0x00 };
+    json command;
+
+    pkt[2] = 2 + (3 * size);
+    pkt[5] = size;
+    pkt.resize(6 + (3 * size));
+
+    for(std::size_t led_idx = 0; led_idx < size; led_idx++)
+    {
+        pkt[6 + (led_idx * 3)] = RGBGetRValue(colors[led_idx]);
+        pkt[7 + (led_idx * 3)] = RGBGetGValue(colors[led_idx]);
+        pkt[8 + (led_idx * 3)] = RGBGetBValue(colors[led_idx]);
+    }
+
+    pkt.push_back(CalculateXorChecksum(pkt));
+
+    command["msg"]["cmd"]                       = "razer";
+    command["msg"]["data"]["pt"]                = base64::encode(pkt);
+
+    /*-----------------------------------------------------*\
+    | Convert the JSON object to a string and write it      |
+    \*-----------------------------------------------------*/
+    std::string command_str                     = command.dump();
+
+    port.udp_write((char *)command_str.c_str(), command_str.length() + 1);
+}
+
+void GoveeController::SendRazerDisable()
+{
+    const std::vector<base64::byte> pkt = { 0xBB, 0x00, 0x01, 0xB1, 0x00, 0x0B };
+    json command;
+
+    command["msg"]["cmd"]                       = "razer";
+    command["msg"]["data"]["pt"]                = base64::encode(pkt);
+
+    /*-----------------------------------------------------*\
+    | Convert the JSON object to a string and write it      |
+    \*-----------------------------------------------------*/
+    std::string command_str                     = command.dump();
+
+    port.udp_write((char *)command_str.c_str(), command_str.length() + 1);
+}
+
+void GoveeController::SendRazerEnable()
+{
+    const std::vector<base64::byte> pkt = { 0xBB, 0x00, 0x01, 0xB1, 0x01, 0x0A };
+    json command;
+
+    command["msg"]["cmd"]                       = "razer";
+    command["msg"]["data"]["pt"]                = base64::encode(pkt);
+
+    /*-----------------------------------------------------*\
+    | Convert the JSON object to a string and write it      |
+    \*-----------------------------------------------------*/
+    std::string command_str                     = command.dump();
+
+    port.udp_write((char *)command_str.c_str(), command_str.length() + 1);
+}
+
+void GoveeController::SendScan()
+{
+    json command;
+
+    command["msg"]["cmd"]                       = "scan";
+    command["msg"]["data"]["account_topic"]     = "GA/123456789";
+
+    /*-----------------------------------------------------*\
+    | Convert the JSON object to a string and write it      |
+    \*-----------------------------------------------------*/
+    std::string command_str                     = command.dump();
+
+    broadcast_port.udp_write((char *)command_str.c_str(), command_str.length() + 1);
+}
+
+/*---------------------------------------------------------*\
+| Static class members for shared broadcast receiver        |
+\*---------------------------------------------------------*/
+net_port                        GoveeController::broadcast_port;
+std::vector<GoveeController*>   GoveeController::callbacks;
+std::thread*                    GoveeController::ReceiveThread;
+std::atomic<bool>               GoveeController::ReceiveThreadRun;
+
+void GoveeController::ReceiveBroadcastThreadFunction()
+{
+    char recv_buf[1024];
+
+    broadcast_port.set_receive_timeout(1, 0);
+
+    while(ReceiveThreadRun.load())
+    {
+        /*-------------------------------------------------*\
+        | Receive up to 1024 bytes from the device with a   |
+        | 1s timeout                                        |
+        \*-------------------------------------------------*/
+        int size = broadcast_port.udp_listen(recv_buf, 1024);
+
+        /*-------------------------------------------------*\
+        | If data was received, loop through registered     |
+        | callback controllers and call the                 |
+        | ReceiveBroadcast function for the controller      |
+        | matching the received data                        |
+        |                                                   |
+        | NOTE: As implemented, it doesn't actually match   |
+        | the intended controller and just calls all        |
+        | registered controllers.  As they are all called   |
+        | sequence, this should work, but if parallel calls |
+        | are ever needed, receives should be filtered by   |
+        | IP address                                        |
+        \*-------------------------------------------------*/
+        if(size > 0)
+        {
+            for(std::size_t callback_idx = 0; callback_idx < callbacks.size(); callback_idx++)
+            {
+                GoveeController* controller = callbacks[callback_idx];
+
+                controller->ReceiveBroadcast(recv_buf, size);
+            }
+        }
+    }
+}
+
+void GoveeController::RegisterReceiveBroadcastCallback(GoveeController* controller_ptr)
+{
+    callbacks.push_back(controller_ptr);
+}
+
+void GoveeController::UnregisterReceiveBroadcastCallback(GoveeController* controller_ptr)
+{
+    for(std::size_t callback_idx = 0; callback_idx < callbacks.size(); callback_idx++)
+    {
+        if(callbacks[callback_idx] == controller_ptr)
+        {
+            callbacks.erase(callbacks.begin() + callback_idx);
+            break;
+        }
+    }
+}

Controllers/GoveeController/GoveeController.h

@@ -0,0 +1,71 @@
+/*---------------------------------------------------------*\
+| GoveeController.h                                         |
+|                                                           |
+|   Driver for Govee wireless lighting devices              |
+|                                                           |
+|   Adam Honse ([email protected])      01 Dec 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include <string>
+#include <thread>
+#include <vector>
+#include "RGBController.h"
+#include "net_port.h"
+
+class GoveeController
+{
+public:
+    GoveeController(std::string ip);
+    ~GoveeController();
+
+    std::string GetLocation();
+    std::string GetSku();
+    std::string GetVersion();
+
+    void ReceiveBroadcast(char* recv_buf, int size);
+
+    void SendRazerData(RGBColor* colors, unsigned int size);
+    void SendRazerDisable();
+    void SendRazerEnable();
+
+    void SendScan();
+
+    void SetColor(unsigned char red, unsigned char green, unsigned char blue, unsigned char brightness);
+
+private:
+    std::string         firmware_version;
+    std::string         ip_address;
+    std::string         module_name;
+    std::string         module_mac;
+
+    std::string         sku;
+    std::string         bleVersionHard;
+    std::string         bleVersionSoft;
+    std::string         wifiVersionHard;
+    std::string         wifiVersionSoft;
+
+    bool                broadcast_received;
+
+    net_port            port;
+
+public:
+    /*-----------------------------------------------------*\
+    | One receive thread is shared among all instances of   |
+    | GoveeController, so the receive thread function is    |
+    | static and the thread is initialized in the detector  |
+    | if any GoveeControllers are created.                  |
+    \*-----------------------------------------------------*/
+    static net_port                             broadcast_port;
+    static std::vector<GoveeController*>        callbacks;
+    static std::thread*                         ReceiveThread;
+    static std::atomic<bool>                    ReceiveThreadRun;
+
+    static void ReceiveBroadcastThreadFunction();
+    static void RegisterReceiveBroadcastCallback(GoveeController* controller_ptr);
+    static void UnregisterReceiveBroadcastCallback(GoveeController* controller_ptr);
+};

Controllers/GoveeController/GoveeControllerDetect.cpp

@@ -0,0 +1,92 @@
+/*---------------------------------------------------------*\
+| GoveeControllerDetect.cpp                                 |
+|                                                           |
+|   Detector for Govee wireless lighting devices            |
+|                                                           |
+|   Adam Honse ([email protected])      01 Dec 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 "GoveeController.h"
+#include "RGBController.h"
+#include "RGBController_Govee.h"
+#include "SettingsManager.h"
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectGoveeControllers                                                                 *
+*                                                                                          *
+*       Detect Govee devices                                                               *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectGoveeControllers()
+{
+    json                    govee_settings;
+
+    /*-----------------------------------------------------*\
+    | Get Govee settings from settings manager              |
+    \*-----------------------------------------------------*/
+    govee_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("GoveeDevices");
+
+    /*-----------------------------------------------------*\
+    | If the Govee settings contains devices, process       |
+    \*-----------------------------------------------------*/
+    if(govee_settings.contains("devices"))
+    {
+        GoveeController::ReceiveThreadRun = false;
+
+        if(govee_settings["devices"].size() > 0)
+        {
+            /*---------------------------------------------*\
+            | Open a UDP client sending to and receiving    |
+            | from the Govee Multicast IP, send port 4001   |
+            | and receive port 4002                         |
+            \*---------------------------------------------*/
+            GoveeController::broadcast_port.udp_client("239.255.255.250", "4001", "4002");
+            GoveeController::broadcast_port.udp_join_multicast_group("239.255.255.250");
+
+            /*---------------------------------------------*\
+            | Start a thread to handle responses received   |
+            | from the Govee device                         |
+            \*---------------------------------------------*/
+            GoveeController::ReceiveThreadRun = true;
+            GoveeController::ReceiveThread = new std::thread(&GoveeController::ReceiveBroadcastThreadFunction);
+        }
+
+        for(unsigned int device_idx = 0; device_idx < govee_settings["devices"].size(); device_idx++)
+        {
+            if(govee_settings["devices"][device_idx].contains("ip"))
+            {
+                std::string govee_ip  = govee_settings["devices"][device_idx]["ip"];
+
+                GoveeController*     controller     = new GoveeController(govee_ip);
+                RGBController_Govee* rgb_controller = new RGBController_Govee(controller);
+
+                ResourceManager::get()->RegisterRGBController(rgb_controller);
+            }
+        }
+
+        /*-------------------------------------------------*\
+        | All controllers have been created, the broadcast  |
+        | receiver thread is no longer needed and can be    |
+        | shut down                                         |
+        \*-------------------------------------------------*/
+        if(GoveeController::ReceiveThreadRun)
+        {
+            GoveeController::ReceiveThreadRun = false;
+            GoveeController::ReceiveThread->join();
+            delete GoveeController::ReceiveThread;
+            GoveeController::broadcast_port.tcp_close();
+        }
+    }
+
+}   /* DetectGoveeControllers() */
+
+REGISTER_DETECTOR("Govee", DetectGoveeControllers);

Controllers/GoveeController/RGBController_Govee.cpp

@@ -0,0 +1,142 @@
+/*---------------------------------------------------------*\
+| RGBController_Govee.cpp                                   |
+|                                                           |
+|   RGBController for Govee wireless lighting devices       |
+|                                                           |
+|   Adam Honse ([email protected])      27 Dec 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include <map>
+#include "RGBController_Govee.h"
+
+using namespace std::chrono_literals;
+
+static std::map<std::string, unsigned int> govee_led_counts
+{
+    { "H619A", 20  },
+    { "H70B1", 20  },
+};
+
+RGBController_Govee::RGBController_Govee(GoveeController* controller_ptr)
+{
+    controller  = controller_ptr;
+
+    name        = "Govee " + controller->GetSku();
+    vendor      = "Govee";
+    type        = DEVICE_TYPE_LIGHT;
+    description = "Govee Device";
+    location    = controller->GetLocation();
+    version     = controller->GetVersion();
+
+    mode Static;
+    Static.name         = "Static";
+    Static.value        = 1;
+    Static.flags        = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR;
+    Static.color_mode   = MODE_COLORS_MODE_SPECIFIC;
+    Static.colors_min   = 1;
+    Static.colors_max   = 1;
+    Static.colors.resize(1);
+    modes.push_back(Static);
+
+    mode Direct;
+    Direct.name         = "Direct";
+    Direct.value        = 0;
+    Direct.flags        = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode   = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
+    SetupZones();
+
+    keepalive_thread_run    = 1;
+    keepalive_thread        = new std::thread(&RGBController_Govee::KeepaliveThread, this);
+}
+
+RGBController_Govee::~RGBController_Govee()
+{
+    keepalive_thread_run = 0;
+    keepalive_thread->join();
+    delete keepalive_thread;
+
+    delete controller;
+}
+
+void RGBController_Govee::SetupZones()
+{
+    unsigned int led_count = govee_led_counts[controller->GetSku()];
+
+    zone strip;
+    strip.name          = "Govee Strip";
+    strip.type          = ZONE_TYPE_LINEAR;
+    strip.leds_count    = led_count;
+    strip.leds_min      = led_count;
+    strip.leds_max      = led_count;
+    strip.matrix_map    = NULL;
+    zones.push_back(strip);
+
+    for(std::size_t led_idx = 0; led_idx < strip.leds_count; led_idx++)
+    {
+        led strip_led;
+        strip_led.name      = "Govee LED";
+        leds.push_back(strip_led);
+    }
+
+    SetupColors();
+}
+
+void RGBController_Govee::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_Govee::DeviceUpdateLEDs()
+{
+    last_update_time = std::chrono::steady_clock::now();
+
+    if(modes[active_mode].color_mode == MODE_COLORS_PER_LED)
+    {
+        controller->SendRazerData(&colors[0], colors.size());
+    }
+}
+
+void RGBController_Govee::UpdateZoneLEDs(int /*zone*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_Govee::UpdateSingleLED(int /*led*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_Govee::DeviceUpdateMode()
+{
+    if(modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC)
+    {
+        unsigned char red = RGBGetRValue(modes[active_mode].colors[0]);
+        unsigned char grn = RGBGetGValue(modes[active_mode].colors[0]);
+        unsigned char blu = RGBGetBValue(modes[active_mode].colors[0]);
+        controller->SetColor(red, grn, blu, 255);
+    }
+    else
+    {
+        controller->SendRazerEnable();
+        DeviceUpdateLEDs();
+    }
+}
+
+void RGBController_Govee::KeepaliveThread()
+{
+    while(keepalive_thread_run.load())
+    {
+        if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::seconds(30))
+        {
+            DeviceUpdateLEDs();
+        }
+        std::this_thread::sleep_for(10s);
+    }
+}

Controllers/GoveeController/RGBController_Govee.h

@@ -0,0 +1,39 @@
+/*---------------------------------------------------------*\
+| RGBController_Govee.h                                     |
+|                                                           |
+|   RGBController for Govee wireless lighting devices       |
+|                                                           |
+|   Adam Honse (calcprogrammer1@gmail.com)      01 Dec 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "GoveeController.h"
+
+class RGBController_Govee : public RGBController
+{
+public:
+    RGBController_Govee(GoveeController* controller_ptr);
+    ~RGBController_Govee();
+
+    void        SetupZones();
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+    void        KeepaliveThread();
+
+private:
+    GoveeController*                                    controller;
+    std::thread*                                        keepalive_thread;
+    std::atomic<bool>                                   keepalive_thread_run;
+    std::chrono::time_point<std::chrono::steady_clock>  last_update_time;
+};

Controllers/GoveeController/base64.hpp

@@ -0,0 +1,111 @@
+#pragma once
+
+#include <string>
+#include <vector>
+#include <stdexcept>
+#include <cstdint>
+
+namespace base64
+{
+	inline static const char kEncodeLookup[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+	inline static const char kPadCharacter = '=';
+
+	using byte = std::uint8_t;
+
+	inline std::string encode(const std::vector<byte>& input)
+	{
+		std::string encoded;
+		encoded.reserve(((input.size() / 3) + (input.size() % 3 > 0)) * 4);
+
+		std::uint32_t temp{};
+		auto it = input.begin();
+
+		for(std::size_t i = 0; i < input.size() / 3; ++i)
+		{
+			temp  = (*it++) << 16;
+			temp += (*it++) << 8;
+			temp += (*it++);
+			encoded.append(1, kEncodeLookup[(temp & 0x00FC0000) >> 18]);
+			encoded.append(1, kEncodeLookup[(temp & 0x0003F000) >> 12]);
+			encoded.append(1, kEncodeLookup[(temp & 0x00000FC0) >> 6 ]);
+			encoded.append(1, kEncodeLookup[(temp & 0x0000003F)      ]);
+		}
+
+		switch(input.size() % 3)
+		{
+		case 1:
+			temp = (*it++) << 16;
+			encoded.append(1, kEncodeLookup[(temp & 0x00FC0000) >> 18]);
+			encoded.append(1, kEncodeLookup[(temp & 0x0003F000) >> 12]);
+			encoded.append(2, kPadCharacter);
+			break;
+		case 2:
+			temp  = (*it++) << 16;
+			temp += (*it++) << 8;
+			encoded.append(1, kEncodeLookup[(temp & 0x00FC0000) >> 18]);
+			encoded.append(1, kEncodeLookup[(temp & 0x0003F000) >> 12]);
+			encoded.append(1, kEncodeLookup[(temp & 0x00000FC0) >> 6 ]);
+			encoded.append(1, kPadCharacter);
+			break;
+		}
+
+		return encoded;
+	}
+
+	inline std::vector<byte> decode(const std::string& input)
+	{
+		if(input.length() % 4)
+			throw std::runtime_error("Invalid base64 length!");
+
+		std::size_t padding{};
+
+		if(input.length())
+		{
+			if(input[input.length() - 1] == kPadCharacter) padding++;
+			if(input[input.length() - 2] == kPadCharacter) padding++;
+		}
+
+		std::vector<byte> decoded;
+		decoded.reserve(((input.length() / 4) * 3) - padding);
+
+		std::uint32_t temp{};
+		auto it = input.begin();
+
+		while(it < input.end())
+		{
+			for(std::size_t i = 0; i < 4; ++i)
+			{
+				temp <<= 6;
+				if     (*it >= 0x41 && *it <= 0x5A) temp |= *it - 0x41;
+				else if(*it >= 0x61 && *it <= 0x7A) temp |= *it - 0x47;
+				else if(*it >= 0x30 && *it <= 0x39) temp |= *it + 0x04;
+				else if(*it == 0x2B)                temp |= 0x3E;
+				else if(*it == 0x2F)                temp |= 0x3F;
+				else if(*it == kPadCharacter)
+				{
+					switch(input.end() - it)
+					{
+					case 1:
+						decoded.push_back((temp >> 16) & 0x000000FF);
+						decoded.push_back((temp >> 8 ) & 0x000000FF);
+						return decoded;
+					case 2:
+						decoded.push_back((temp >> 10) & 0x000000FF);
+						return decoded;
+					default:
+						throw std::runtime_error("Invalid padding in base64!");
+					}
+				}
+				else throw std::runtime_error("Invalid character in base64!");
+
+				++it;
+			}
+
+			decoded.push_back((temp >> 16) & 0x000000FF);
+			decoded.push_back((temp >> 8 ) & 0x000000FF);
+			decoded.push_back((temp      ) & 0x000000FF);
+		}
+
+		return decoded;
+	}
+}

Controllers/HYTEKeyboardController/RGBController_HYTEKeyboard.cpp

@@ -41,19 +41,19 @@ keyboard_keymap_overlay_values hyte_keeb_tkl_layout =
         }
     },
     {
-        /*---------------------------------------------------------------------------------------------------------*\
-        | Edit Keys - Add additional LEDs for space bar underglow and media keys                                    |
-        |   Zone,   Row,    Column,     Value,      Key,                        OpCode,                             |
-        \*---------------------------------------------------------------------------------------------------------*/
-        {   0,      5,      4,          109,        KEY_EN_SPACE,               KEYBOARD_OPCODE_SWAP_ONLY,          },
-        {   0,      5,      5,          110,        KEY_EN_SPACE,               KEYBOARD_OPCODE_SWAP_ONLY,          },
-        {   0,      5,      7,          112,        KEY_EN_SPACE,               KEYBOARD_OPCODE_SWAP_ONLY,          },
-        {   0,      5,      8,          113,        KEY_EN_SPACE,               KEYBOARD_OPCODE_SWAP_ONLY,          },
-        {   0,      0,      0,          77,         KEY_EN_MEDIA_STOP,          KEYBOARD_OPCODE_INSERT_ROW,         },
-        {   0,      0,      1,          78,         KEY_EN_MEDIA_PREVIOUS,      KEYBOARD_OPCODE_SWAP_ONLY,          },
-        {   0,      0,      2,          79,         KEY_EN_MEDIA_PLAY_PAUSE,    KEYBOARD_OPCODE_SWAP_ONLY,          },
-        {   0,      0,      3,          98,         KEY_EN_MEDIA_NEXT,          KEYBOARD_OPCODE_SWAP_ONLY,          },
-        {   0,      0,      4,          100,        KEY_EN_MEDIA_MUTE,          KEYBOARD_OPCODE_SWAP_ONLY,          },
+        /*-------------------------------------------------------------------------------------------------------------------------------------*\
+        | Edit Keys - Add additional LEDs for space bar underglow and media keys                                                                |
+        |   Zone,   Row,    Column,     Value,      Name,                       Alternate Name,             OpCode                              |
+        \*-------------------------------------------------------------------------------------------------------------------------------------*/
+        {   0,      5,      4,          109,        KEY_EN_SPACE,               KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
+        {   0,      5,      5,          110,        KEY_EN_SPACE,               KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
+        {   0,      5,      7,          112,        KEY_EN_SPACE,               KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
+        {   0,      5,      8,          113,        KEY_EN_SPACE,               KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
+        {   0,      0,      0,          77,         KEY_EN_MEDIA_STOP,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_INSERT_ROW,         },
+        {   0,      0,      1,          78,         KEY_EN_MEDIA_PREVIOUS,      KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
+        {   0,      0,      2,          79,         KEY_EN_MEDIA_PLAY_PAUSE,    KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
+        {   0,      0,      3,          98,         KEY_EN_MEDIA_NEXT,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
+        {   0,      0,      4,          100,        KEY_EN_MEDIA_MUTE,          KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
     }
 };
 

Controllers/HYTENexusController/RGBController_HYTENexus.cpp

@@ -13,6 +13,22 @@
 
 using namespace std::chrono_literals;
 
+//0xFFFFFFFF indicates an unused entry in matrix
+#define NA  0xFFFFFFFF
+
+static unsigned int thicc_q60_matrix_map[9][5] =
+{
+    {  33,  32,  NA,  17,   0 },
+    {  34,  31,  NA,  16,   1 },
+    {  35,  30,  NA,  15,   2 },
+    {  36,  29,  18,  14,   3 },
+    {  37,  28,  19,  13,   4 },
+    {  38,  27,  20,  12,   5 },
+    {  39,  26,  21,  11,   6 },
+    {  40,  25,  22,  10,   7 },
+    {  41,  24,  23,   9,   8 },
+};
+
 RGBController_HYTENexus::RGBController_HYTENexus(HYTENexusController* controller_ptr)
 {
     controller          = controller_ptr;
@@ -79,8 +95,6 @@ void RGBController_HYTENexus::SetupZones()
         channel_zone.leds_count = channel_leds;
         channel_zone.matrix_map = NULL;
 
-        zones.push_back(channel_zone);
-
         for(unsigned int led_idx = 0; led_idx < channel_leds; led_idx++)
         {
             led channel_led;
@@ -102,7 +116,7 @@ void RGBController_HYTENexus::SetupZones()
             logo_segment.start_idx      = start_idx;
             logo_segment.type           = ZONE_TYPE_SINGLE;
 
-            zones[channel].segments.push_back(logo_segment);
+            channel_zone.segments.push_back(logo_segment);
 
             start_idx                  += logo_segment.leds_count;
         }
@@ -111,12 +125,18 @@ void RGBController_HYTENexus::SetupZones()
         {
             segment lcd_leds_segment;
 
-            lcd_leds_segment.name       = "LCD LED Matrix";
-            lcd_leds_segment.leds_count = 42;
-            lcd_leds_segment.start_idx  = start_idx;
-            lcd_leds_segment.type       = ZONE_TYPE_SINGLE;
+            lcd_leds_segment.name           = "LCD LED Matrix";
+            lcd_leds_segment.leds_count     = 42;
+            lcd_leds_segment.start_idx      = start_idx;
+            lcd_leds_segment.type           = ZONE_TYPE_MATRIX;
 
-            zones[channel].segments.push_back(lcd_leds_segment);
+            channel_zone.type               = ZONE_TYPE_MATRIX;
+            channel_zone.matrix_map         = new matrix_map_type;
+            channel_zone.matrix_map->height = 9;
+            channel_zone.matrix_map->width  = 5;
+            channel_zone.matrix_map->map    = (unsigned int *)&thicc_q60_matrix_map;
+
+            channel_zone.segments.push_back(lcd_leds_segment);
 
             start_idx                  += lcd_leds_segment.leds_count;
         }
@@ -132,11 +152,13 @@ void RGBController_HYTENexus::SetupZones()
                 device_segment.start_idx    = start_idx;
                 device_segment.type         = ZONE_TYPE_LINEAR;
 
-                zones[channel].segments.push_back(device_segment);
+                channel_zone.segments.push_back(device_segment);
 
                 start_idx                  += device_segment.leds_count;
             }
         }
+
+        zones.push_back(channel_zone);
     }
 
     SetupColors();

Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/HyperXAlloyOriginsCoreController.cpp

@@ -5,6 +5,7 @@
 |                                                           |
 |   Volodymyr Nazarchuk (Vavooon)               28 Apr 2021 |
 |   Mike White (kamaaina)                       09 Jun 2021 |
+|   carlos jordao                               15 Mar 2025 |
 |                                                           |
 |   This file is part of the OpenRGB project                |
 |   SPDX-License-Identifier: GPL-2.0-only                   |
@@ -13,9 +14,8 @@
 #include <cstring>
 #include "HyperXAlloyOriginsCoreController.h"
 #include "StringUtils.h"
+#include "LogManager.h"
 
-// Skip these indices in the color output
-static unsigned int skip_idx[] = {6, 7, 14, 15, 22, 23, 30, 31, 38, 39, 44, 46, 47, 54, 55, 58, 60, 61, 62, 63, 70, 71, 78, 79, 86, 87, 94, 95, 101, 102, 103, 109, 110, 111, 118, 119};
 
 HyperXAlloyOriginsCoreController::HyperXAlloyOriginsCoreController(hid_device* dev_handle, hid_device_info* dev_info)
 {
@@ -62,6 +62,38 @@ std::string HyperXAlloyOriginsCoreController::GetFirmwareVersion()
     return(firmware_version);
 }
 
+unsigned int HyperXAlloyOriginsCoreController::GetVariant()
+{
+    unsigned char packet[65];
+    unsigned int variant = 0;
+    int actual = 0;
+
+    memset(packet, 0x00, sizeof(packet));
+
+    /*---------------------------------------*\
+    | Command 10 asks some data from keyboard |
+    | The answer looks like:                  |
+    | * command answer header (bytes 0-4)     |
+    |   * data length: byte 4                 |
+    | * version               (bytes 5-6)     |
+    | * Product string        (bytes 9-33)    |
+    | * Layout variant        (byte  56)      |
+    \*---------------------------------------*/
+    packet[1] = 0x10;
+    hid_write(dev, packet, 65);
+    memset(packet, 0x00, sizeof(packet));
+    actual = hid_read(dev, packet, 65);
+
+    if(actual > 0)
+        variant = packet[56];
+    else
+        variant = 0x09;
+
+    LOG_DEBUG("[HyperX Alloy Origins Core] variant: 0x%02X", variant);
+    return variant;
+}
+
+
 void HyperXAlloyOriginsCoreController::SetBrightness(unsigned int brightness)
 {
     unsigned char packet[65];
@@ -77,30 +109,46 @@ void HyperXAlloyOriginsCoreController::SetBrightness(unsigned int brightness)
 
 void HyperXAlloyOriginsCoreController::SetLEDsDirect(std::vector<RGBColor> colors)
 {
-    for(unsigned int skip_cnt = 0; skip_cnt < (sizeof(skip_idx) / sizeof(skip_idx[0])); skip_cnt++)
-    {
-        colors.insert(colors.begin() + skip_idx[skip_cnt], 0x00000000);
-    }
-
+    /*------------------------------------------------------------------------------*\
+    | * Always send 380 bytes to the keyboard and a total of 94 led indexes.         |
+    | The colors are grouped into segments of 48 bytes.                              |
+    | Each one is divided into:                                                      |
+    |    6 Green + 2 zeroes +  6 Green + 2 zeroes +                                  |
+    |    6 Red   + 2 zeroes +  6 Red   + 2 zeroes +                                  |
+    |    6 Blue  + 2 zeroes +  6 Blue  + 2 zeroes                                    |
+    |    \=---> sector 0       \=--> sector 1                                        |
+    | Every 6 colors form a sector. The names are arbitrary, just to make clear how  |
+    | to set the colors into the buffer.                                             |
+    | So each segment has 2 sectors and 12 colors.                                   |
+    | The last 10 colors don't fill completely the last segment.                     |
+    | * All 94 colors can be sent even if some of them aren't used by the physical   |
+    | keyboard. This allows to lit every key, even if not mapped directly.           |
+    \*------------------------------------------------------------------------------*/
+    unsigned int segment = 0, sector = 0, sequence = 0;
+    unsigned int total_colors = 0;
     unsigned char buf[380];
     memset(buf, 0x00, sizeof(buf));
 
-    int offset = 0;
-    int rowPos = 0;
+    /*---------------------------------------------------------------------------*\
+    | transfer the colors to the buffer. Max 94 colors to avoid buffer overflow.  |
+    \*---------------------------------------------------------------------------*/
+    if(colors.size() > 94)
+        total_colors = 94;
+    else
+        total_colors = colors.size();
 
-    for(unsigned int color_idx = 0; color_idx < colors.size(); color_idx++)
+    for(unsigned int color_idx = 0; color_idx < total_colors; color_idx++)
     {
-        if (color_idx > 0 && color_idx % 16 == 0)
-        {
-            offset += 48;
-            rowPos = 0;
-        }
+        unsigned int pos = 0;
+        segment  = (color_idx / 12) * 48;
+        sector   = ((color_idx / 6) & 1) * 8;
+        sequence = color_idx % 6;
 
-        buf[rowPos + offset]      = RGBGetGValue(colors[color_idx]);
-        buf[rowPos + offset + 16] = RGBGetRValue(colors[color_idx]);
-        buf[rowPos + offset + 32] = RGBGetBValue(colors[color_idx]);
+        pos = segment + sector + sequence;
 
-        rowPos++;
+        buf[pos     ] = RGBGetGValue(colors[color_idx]);
+        buf[pos + 16] = RGBGetRValue(colors[color_idx]);
+        buf[pos + 32] = RGBGetBValue(colors[color_idx]);
     }
 
     unsigned int sentBytes   = 0;
@@ -123,7 +171,7 @@ void HyperXAlloyOriginsCoreController::SetLEDsDirect(std::vector<RGBColor> color
         packet[4] = payloadSize;
 
         memcpy(&packet[5], &buf[sentBytes], payloadSize);
-        hid_write(dev, packet, 65);
+        hid_write(dev, packet, payloadSize + 5);
 
         sentBytes += payloadSize;
     }

Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/HyperXAlloyOriginsCoreController.h

@@ -24,6 +24,7 @@ public:
     std::string     GetDeviceLocation();
     std::string     GetSerialString();
     std::string     GetFirmwareVersion();
+    unsigned int    GetVariant();
 
     void SetLEDsDirect(std::vector<RGBColor> colors);
     void SetBrightness(unsigned int brightness);

Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/RGBController_HyperXAlloyOriginsCore.cpp

@@ -4,6 +4,7 @@
 |   RGBController for HyperX Alloy Origins Core keyboard    |
 |                                                           |
 |   Volodymyr Nazarchuk (Vavooon)               28 Apr 2021 |
+|   carlos jordao                               15 Mar 2025 |
 |                                                           |
 |   This file is part of the OpenRGB project                |
 |   SPDX-License-Identifier: GPL-2.0-only                   |
@@ -17,17 +18,20 @@ using namespace std::chrono_literals;
 #define HYPERX_MIN_BRIGHTNESS   0
 #define HYPERX_MAX_BRIGHTNESS 255
 
-//0xFFFFFFFF indicates an unused entry in matrix
 #define NA  0xFFFFFFFF
 
+/*----------------------------------*\
+|  Maps LED position number to keys  |
+|  * based on ANSI QWERTY            |
+\*----------------------------------*/
 static unsigned int matrix_map[6][19] =
 {
-        {   0,  NA,   1,   2,   3,   4,   5,   6,   7,  44,  NA,  45,  46,  47,  48,  NA,  49,  50,  51 },
-        {   8,   9,  10,  11,  12,  13,  14,  15,  16,  52,  53,  54,  55,  56,  NA,  NA,  57,  58,  59 },
-        {  17,  NA,  18,  19,  20,  21,  22,  23,  24,  60,  61,  62,  63,  64,  65,  NA,  66,  67,  68 },
-        {  25,  NA,  26,  27,  28,  29,  30,  31,  32,  69,  70,  71,  72,  73,  NA,  NA,  NA,  NA,  NA },
-        {  33,  NA,  34,  35,  36,  37,  38,  NA,  39,  74,  75,  76,  77,  78,  NA,  NA,  NA,  79,  NA },
-        {  40,  41,  42,  NA,  NA,  NA,  43,  NA,  NA,  NA,  NA,  80,  81,  82,  83,  NA,  84,  85,  86 }
+        {   0,  NA,   1,   2,   3,   4,   5,   6,   7,  48,  NA,  49,  50,  51,  52,  NA,  53,  54,  55 },
+        {   8,   9,  10,  11,  12,  13,  14,  15,  16,  56,  57,  58,  59,  60,  NA,  NA,  61,  62,  63 },
+        {  17,  NA,  18,  19,  20,  21,  22,  23,  24,  64,  65,  66,  67,  68,  69,  NA,  70,  71,  72 },
+        {  25,  NA,  26,  27,  28,  29,  30,  31,  32,  73,  74,  75,  76,  78,  NA,  NA,  NA,  NA,  NA },
+        {  33,  NA,  35,  36,  37,  38,  39,  40,  79,  80,  81,  NA,  83,  84,  NA,  NA,  NA,  85,  NA },
+        {  41,  42,  43,  NA,  NA,  NA,  45,  NA,  NA,  NA,  NA,  86,  87,  88,  89,  NA,  90,  91,  92 }
 };
 
 static const char* zone_names[] =
@@ -40,115 +44,133 @@ static zone_type zone_types[] =
     ZONE_TYPE_MATRIX,
 };
 
-static const unsigned int zone_sizes[] =
+
+/*--------------------------------------------------------------------------------*\
+| This keyboard (TKL) always receives 93 led colors.                               |
+| * Some indexes are just blank (unused).                                          |
+| * Regional layouts have a few different enabled or disabled led indexes.         |
+| * All indexes need to be sent anyway. Declaring all of them makes it easier to   |
+|   add new layouts without creating a new matrix map.                             |
+| * led_names contains the indexes used by the HyperX keyboard                     |
+\*--------------------------------------------------------------------------------*/
+struct led_index
 {
-    87,
+   const char *name;
+   unsigned int index;
 };
 
-static const char *led_names[] =
+static led_index led_names[] =
 {
-    KEY_EN_ESCAPE,
-    KEY_EN_F1,
-    KEY_EN_F2,
-    KEY_EN_F3,
-    KEY_EN_F4,
-    KEY_EN_F5,
-    KEY_EN_F6,
-    KEY_EN_F7,
+    {KEY_EN_ESCAPE,           0},
+    {KEY_EN_F1,               1},
+    {KEY_EN_F2,               2},
+    {KEY_EN_F3,               3},
+    {KEY_EN_F4,               4},
+    {KEY_EN_F5,               5},
+    {KEY_EN_F6,               6},
+    {KEY_EN_F7,               7},
 
-    KEY_EN_BACK_TICK,
-    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_BACK_TICK,        8},
+    {KEY_EN_1,                9},
+    {KEY_EN_2,               10},
+    {KEY_EN_3,               11},
+    {KEY_EN_4,               12},
+    {KEY_EN_5,               13},
+    {KEY_EN_6,               14},
+    {KEY_EN_7,               15},
+    {KEY_EN_8,               16},
 
-    KEY_EN_TAB,
-    KEY_EN_Q,
-    KEY_EN_W,
-    KEY_EN_E,
-    KEY_EN_R,
-    KEY_EN_T,
-    KEY_EN_Y,
-    KEY_EN_U,
+    {KEY_EN_TAB,             17},
+    {KEY_EN_Q,               18},
+    {KEY_EN_W,               19},
+    {KEY_EN_E,               20},
+    {KEY_EN_R,               21},
+    {KEY_EN_T,               22},
+    {KEY_EN_Y,               23},
+    {KEY_EN_U,               24},
 
-    KEY_EN_CAPS_LOCK,
-    KEY_EN_A,
-    KEY_EN_S,
-    KEY_EN_D,
-    KEY_EN_F,
-    KEY_EN_G,
-    KEY_EN_H,
-    KEY_EN_J,
+    {KEY_EN_CAPS_LOCK,       25},
+    {KEY_EN_A,               26},
+    {KEY_EN_S,               27},
+    {KEY_EN_D,               28},
+    {KEY_EN_F,               29},
+    {KEY_EN_G,               30},
+    {KEY_EN_H,               31},
+    {KEY_EN_J,               32},
 
-    KEY_EN_LEFT_SHIFT,
-    KEY_EN_Z,
-    KEY_EN_X,
-    KEY_EN_C,
-    KEY_EN_V,
-    KEY_EN_B,
-    KEY_EN_N,
+    {KEY_EN_LEFT_SHIFT,      33},
+    {KEY_EN_UNUSED,          34},
+    {KEY_EN_Z,               35},
+    {KEY_EN_X,               36},
+    {KEY_EN_C,               37},
+    {KEY_EN_V,               38},
+    {KEY_EN_B,               39},
+    {KEY_EN_N,               40},
 
-    KEY_EN_LEFT_CONTROL,
-    KEY_EN_LEFT_WINDOWS,
-    KEY_EN_LEFT_ALT,
-    KEY_EN_SPACE,
+    {KEY_EN_LEFT_CONTROL,    41},
+    {KEY_EN_LEFT_WINDOWS,    42},
+    {KEY_EN_LEFT_ALT,        43},
+
+    {KEY_EN_UNUSED,          44},
+    {KEY_EN_SPACE,           45},
+    {KEY_EN_UNUSED,          46},
+    {KEY_EN_UNUSED,          47},
 
     // End of first section
 
-    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_F8,              48},
+    {KEY_EN_F9,              49},
+    {KEY_EN_F10,             50},
+    {KEY_EN_F11,             51},
+    {KEY_EN_F12,             52},
+    {KEY_EN_PRINT_SCREEN,    53},
+    {KEY_EN_SCROLL_LOCK,     54},
+    {KEY_EN_PAUSE_BREAK,     55},
 
-    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_9,               56},
+    {KEY_EN_0,               57},
+    {KEY_EN_MINUS,           58},
+    {KEY_EN_EQUALS,          59},
+    {KEY_EN_BACKSPACE,       60},
+    {KEY_EN_INSERT,          61},
+    {KEY_EN_HOME,            62},
+    {KEY_EN_PAGE_UP,         63},
 
+    {KEY_EN_I,               64},
+    {KEY_EN_O,               65},
+    {KEY_EN_P,               66},
+    {KEY_EN_LEFT_BRACKET,    67},
+    {KEY_EN_RIGHT_BRACKET,   68},
+    {KEY_EN_ANSI_BACK_SLASH, 69},
 
-    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_DELETE,          70},
+    {KEY_EN_END,             71},
+    {KEY_EN_PAGE_DOWN,       72},
 
+    {KEY_EN_K,               73},
+    {KEY_EN_L,               74},
+    {KEY_EN_SEMICOLON,       75},
+    {KEY_EN_QUOTE,           76},
+    {KEY_EN_POUND,           77},
+    {KEY_EN_ANSI_ENTER,      78},
 
-    KEY_EN_K,
-    KEY_EN_L,
-    KEY_EN_SEMICOLON,
-    KEY_EN_QUOTE,
-    KEY_EN_ANSI_ENTER,
+    {KEY_EN_M,               79},
+    {KEY_EN_COMMA,           80},
+    {KEY_EN_PERIOD,          81},
+    {KEY_EN_UNUSED,          82},
+    {KEY_EN_FORWARD_SLASH,   83},
+    {KEY_EN_RIGHT_SHIFT,     84},
 
+    {KEY_EN_UP_ARROW,        85},
 
-    KEY_EN_M,
-    KEY_EN_COMMA,
-    KEY_EN_PERIOD,
-    KEY_EN_FORWARD_SLASH,
-    KEY_EN_RIGHT_SHIFT,
-    KEY_EN_UP_ARROW,
-    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_RIGHT_ALT,       86},
+    {KEY_EN_RIGHT_FUNCTION,  87},
+    {KEY_EN_MENU,            88},
+    {KEY_EN_RIGHT_CONTROL,   89},
+
+    {KEY_EN_LEFT_ARROW,      90},
+    {KEY_EN_DOWN_ARROW,      91},
+    {KEY_EN_RIGHT_ARROW,     92}
 };
 
 /**------------------------------------------------------------------*\
@@ -173,6 +195,7 @@ RGBController_HyperXAlloyOriginsCore::RGBController_HyperXAlloyOriginsCore(Hyper
     location    = controller->GetDeviceLocation();
     serial      = controller->GetSerialString();
     version     = controller->GetFirmwareVersion();
+    variant     = controller->GetVariant();
 
     mode Direct;
     Direct.name             = "Direct";
@@ -218,19 +241,56 @@ RGBController_HyperXAlloyOriginsCore::~RGBController_HyperXAlloyOriginsCore()
 
 void RGBController_HyperXAlloyOriginsCore::SetupZones()
 {
-    unsigned int total_led_count = 0;
+    const unsigned int total_leds = sizeof(led_names) / sizeof(led_names[0]);
+    zone new_zone;
+
     for(unsigned int zone_idx = 0; zone_idx < 1; zone_idx++)
     {
-        zone new_zone;
-        new_zone.name                   = zone_names[zone_idx];
-        new_zone.type                   = zone_types[zone_idx];
-        new_zone.leds_min               = zone_sizes[zone_idx];
-        new_zone.leds_max               = zone_sizes[zone_idx];
-        new_zone.leds_count             = zone_sizes[zone_idx];
+        new_zone.name  = zone_names[zone_idx];
+        new_zone.type  = zone_types[zone_idx];
+
+        /*-----------------------------------------------------*\
+        |   Regional configuration can be done by setting       |
+        |   the relevant keys based on the led map.             |
+        \*-----------------------------------------------------*/
+        if(variant == HYPERX_ALLOY_ORIGINS_CORE_ABNT2)
+        {
+            // Sets the led indexes of this variant
+            matrix_map[2][14] = NA;
+            matrix_map[3][13] = 77; // ]
+            matrix_map[3][14] = 78; // enter
+            matrix_map[4][ 1] = 34; // backslash
+            matrix_map[4][11] = 82; // ;
+
+            // corrects the visual representantion
+            led_names[ 8].name = KEY_EN_QUOTE;
+            led_names[34].name = KEY_EN_ISO_BACK_SLASH;
+            led_names[67].name = KEY_NORD_ACUTE_GRAVE;
+            led_names[68].name = KEY_EN_LEFT_BRACKET;
+            led_names[69].name = KEY_EN_UNUSED;
+            led_names[75].name = KEY_FR_CEDILLA_C;
+            led_names[76].name = KEY_BR_TILDE;
+            led_names[77].name = KEY_EN_RIGHT_BRACKET;
+            led_names[78].name = KEY_EN_ISO_ENTER;
+            led_names[82].name = KEY_EN_SEMICOLON;
+        }
+
+        for(unsigned int led_idx = 0; led_idx < total_leds; led_idx++)
+        {
+            led new_led;
+            new_led.name  = led_names[led_idx].name;
+            new_led.value = led_names[led_idx].index;
+            leds.push_back(new_led);
+        }
+
+        matrix_map_type * keyboard_map  = new matrix_map_type;
+        new_zone.leds_count             = total_leds;
+        new_zone.leds_min               = new_zone.leds_count;
+        new_zone.leds_max               = new_zone.leds_count;
 
         if(zone_types[zone_idx] == ZONE_TYPE_MATRIX)
         {
-            new_zone.matrix_map         = new matrix_map_type;
+            new_zone.matrix_map         = keyboard_map;
             new_zone.matrix_map->height = 6;
             new_zone.matrix_map->width  = 19;
             new_zone.matrix_map->map    = (unsigned int *)&matrix_map;
@@ -239,19 +299,8 @@ void RGBController_HyperXAlloyOriginsCore::SetupZones()
         {
             new_zone.matrix_map         = NULL;
         }
-
         zones.push_back(new_zone);
-
-        total_led_count += zone_sizes[zone_idx];
     }
-
-    for(unsigned int led_idx = 0; led_idx < total_led_count; led_idx++)
-    {
-        led new_led;
-        new_led.name = led_names[led_idx];
-        leds.push_back(new_led);
-    }
-
     SetupColors();
 }
 

Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/RGBController_HyperXAlloyOriginsCore.h

@@ -15,6 +15,9 @@
 #include "RGBController.h"
 #include "HyperXAlloyOriginsCoreController.h"
 
+#define HYPERX_ALLOY_ORIGINS_CORE_ANSI      0x09
+#define HYPERX_ALLOY_ORIGINS_CORE_ABNT2     0x10
+
 class RGBController_HyperXAlloyOriginsCore : public RGBController
 {
 public:
@@ -38,4 +41,5 @@ private:
     std::thread*                                        keepalive_thread;
     std::atomic<bool>                                   keepalive_thread_run;
     std::chrono::time_point<std::chrono::steady_clock>  last_update_time;
+    unsigned int                                        variant;
 };

Controllers/JGINYUEInternalUSBV2Controller/JGINYUEInternalUSBV2Controller.cpp

@@ -97,8 +97,8 @@ void JGINYUEInternalUSBV2Controller::Init_device()
     if(usb_buf[1] != 0x0F)
     {
         ZoneCount = 0x00;
-        memset(device_config, 0x00, 8*sizeof(AreaConfigurationV2));
-        memset (&device_config_Global, 0x00, 8*sizeof(AreaConfigurationV2));
+        memset(device_config, 0x00, sizeof(device_config));
+        memset (&device_config_Global, 0x00, sizeof(device_config_Global));
         return;
     }
     unsigned char Zone_Info = usb_buf[4];

Controllers/JGINYUEInternalUSBV2Controller/JGINYUEInternalUSBV2Controller.h

@@ -43,7 +43,7 @@ enum
     JGINYUE_USB_V2_MODE_CYCLING_RAINING    = 0x22,
     JGINYUE_USB_V2_MODE_MULTICOLOR_WATER_2 = 0x23,
     JGINYUE_USB_V2_MODE_MULTICOLOR_WATER_1 = 0x24,
-    JGINYUE_USB_V2_MODE_HOURGLASS          = 0x25    
+    JGINYUE_USB_V2_MODE_HOURGLASS          = 0x25
 };
 
 enum
@@ -79,7 +79,7 @@ enum
 
 struct AreaConfigurationV2
 {
-    unsigned char   Area_ID;                    
+    unsigned char   Area_ID;
     unsigned char   Max_LED_numbers;
     unsigned char   User_LED_numbers;
     unsigned char   Direction;
@@ -120,23 +120,18 @@ public:
         unsigned char   num_LEDs,
         unsigned char   Area
         );
-    
+
     AreaConfigurationV2 device_config[8];
     //TODO,When the perzone mode is supported, these parameters will be used to download device configuartion from the device
     AreaConfigurationV2 device_config_Global;
     //TODO,Can sync its data to other zones,will be used once the perzone mode is supported
-    bool                support_Global_zone;  
-    
+    bool                support_Global_zone;
+
 private:
     void                Init_device();
     void                Init_Zone(int zone);
-    unsigned char       ZoneCount;                       
-    unsigned char       SKUID;
-    unsigned char       Major_version;
-    unsigned char       Minor_version;
-      
-   
-    unsigned char       FPS;                            //0x00 = 120FPS, 0x01 = 60FPS
+    unsigned char       ZoneCount;
+
     hid_device*         jy_hid_interface;
     serial_port*        jy_cdc_interface;
     std::string         location;

Controllers/KasaSmartController/KasaSmartController.cpp

@@ -11,7 +11,7 @@
 
 #include <cstdint>
 #include "KasaSmartController.h"
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 #include "hsv.h"
 
 using json = nlohmann::json;
@@ -273,7 +273,7 @@ void KasaSmartController::SetEffect(std::string effect)
         is_initialized = false;
         return;
     }
-    
+
     std::string response;
     KasaSmartController::SendCommand(effect, response);
     port.tcp_close();

Controllers/KingstonFuryDRAMController/KingstonFuryDRAMControllerDetect.cpp

@@ -70,7 +70,10 @@ TestResult TestForFurySignature(i2c_smbus_interface *bus, unsigned int slot_addr
         {
             res = bus->i2c_smbus_read_word_data(slot_addr, i);
             std::this_thread::sleep_for(FURY_DELAY);
-            if(res >= 0)
+            LOG_DEBUG("[%s] Testing address %02X register %02X, res=%04X",
+                      FURY_CONTROLLER_NAME, slot_addr, i, res);
+            // retry when there is an error or the returned value is 0xFFFF
+            if((res >= 0) && (res < 0xFFFF))
             {
                 break;
             }
@@ -81,8 +84,6 @@ TestResult TestForFurySignature(i2c_smbus_interface *bus, unsigned int slot_addr
         }
 
         char shifted = (res >> 8) & 0xFF;
-        LOG_DEBUG("[%s] Testing address %02X register %02X, res=%02X",
-                  FURY_CONTROLLER_NAME, slot_addr, i, shifted);
         if(shifted != test_str[i-1])
         {
             passed = false;
@@ -198,3 +199,5 @@ void DetectKingstonFuryDDR5Controllers(i2c_smbus_interface* bus, std::vector<SPD
 
 REGISTER_I2C_DIMM_DETECTOR("Kingston Fury DDR4 DRAM", DetectKingstonFuryDDR4Controllers, JEDEC_KINGSTON, SPD_DDR4_SDRAM);
 REGISTER_I2C_DIMM_DETECTOR("Kingston Fury DDR5 DRAM", DetectKingstonFuryDDR5Controllers, JEDEC_KINGSTON, SPD_DDR5_SDRAM);
+REGISTER_I2C_DIMM_DETECTOR("Kingston JEDEC2 Fury DDR4 DRAM", DetectKingstonFuryDDR4Controllers, JEDEC_KINGSTON_2, SPD_DDR4_SDRAM);
+REGISTER_I2C_DIMM_DETECTOR("Kingston JEDEC2 Fury DDR5 DRAM", DetectKingstonFuryDDR5Controllers, JEDEC_KINGSTON_2, SPD_DDR5_SDRAM);

Controllers/LGMonitorController/LGMonitorControllerDetect.cpp

@@ -25,7 +25,7 @@
 #define LG_27GN950_B_PID                               0x9A8A
 #define LG_38GL950G_PID                                0x9A57
 
-void DetectLGMonitorControllers(hid_device_info* info, const std::string& name)
+static void DetectLGMonitorControllers(hid_device_info* info, const std::string& name)
 {
     hid_device* dev = hid_open_path(info->path);
 

Controllers/LGMonitorController/RGBController_LGMonitor.cpp

@@ -29,7 +29,7 @@ RGBController_LGMonitor::RGBController_LGMonitor(LGMonitorController* controller
 {
     controller                          = controller_ptr;
     vendor                              = "LG";
-    type                                = DEVICE_TYPE_ACCESSORY;
+    type                                = DEVICE_TYPE_MONITOR;
     description                         = "LG Monitor";
     location                            = controller->GetDeviceLocation();
     serial                              = controller->GetSerialString();

Controllers/LIFXController/LIFXController.cpp

@@ -10,7 +10,7 @@
 \*---------------------------------------------------------*/
 
 #include "LIFXController.h"
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 #include "hsv.h"
 
 using json = nlohmann::json;

Controllers/LenovoControllers/Lenovo4ZoneUSBController/RGBController_Lenovo4ZoneUSB.cpp

@@ -37,7 +37,7 @@ RGBController_Lenovo4ZoneUSB::RGBController_Lenovo4ZoneUSB(Lenovo4ZoneUSBControl
     controller        = controller_ptr;
 
     name    = controller->getName();
-    type    = DEVICE_TYPE_KEYBOARD;
+    type    = DEVICE_TYPE_LAPTOP;
     vendor  = "Lenovo";
 
 

Controllers/LogitechController/LogitechControllerDetect.cpp

@@ -681,7 +681,7 @@ REGISTER_HID_DETECTOR_IPU("Logitech G203 Lightsync",                        Dete
 REGISTER_HID_DETECTOR_IP ("Logitech G303 Daedalus Apex",                    DetectLogitechMouseG303,    LOGITECH_VID, LOGITECH_G303_PID,                    1, 0xFF00);
 REGISTER_HID_DETECTOR_IP ("Logitech G403 HERO",                             DetectLogitechMouseG403,    LOGITECH_VID, LOGITECH_G403_HERO_PID,               1, 0xFF00);
 REGISTER_HID_DETECTOR_IP ("Logitech G Pro Gaming Mouse",                    DetectLogitechMouseGPRO,    LOGITECH_VID, LOGITECH_G_PRO_PID,                   1, 0xFF00);
-REGISTER_HID_DETECTOR_IP ("Logitech G Pro HERO Gaming Mouse",             DetectLogitechMouseGPRO,    LOGITECH_VID, LOGITECH_G_PRO_HERO_PID,              1, 0xFF00);
+REGISTER_HID_DETECTOR_IP ("Logitech G Pro HERO Gaming Mouse",               DetectLogitechMouseGPRO,    LOGITECH_VID, LOGITECH_G_PRO_HERO_PID,              1, 0xFF00);
 /*-------------------------------------------------------------------------------------------------------------------------------------------------*\
 | Speakers                                                                                                                                         |
 \*-------------------------------------------------------------------------------------------------------------------------------------------------*/
@@ -909,19 +909,20 @@ REGISTER_HID_DETECTOR_IPU("Logitech Powerplay Mat",
 #endif
 
 /*-------------------------------------------------------------------------------------------------------------------------------------------------*\
-| Lightspeed Wireless Devices (Common Wired)                                                                                                          |
+| Lightspeed Wireless Devices (Common Wired)                                                                                                        |
+|   G502 changed to PU to accomodate old and new firmware. Other devices may require similar update #4627                                           |
 \*-------------------------------------------------------------------------------------------------------------------------------------------------*/
+REGISTER_HID_DETECTOR_PU("Logitech G502 Wireless Gaming Mouse (wired)",         DetectLogitechWired,        LOGITECH_VID, LOGITECH_G502_LIGHTSPEED_PID,                    0xFF00, 2);
+
 REGISTER_HID_DETECTOR_IPU("Logitech G502 Proteus Spectrum Gaming Mouse",        DetectLogitechWired,        LOGITECH_VID, LOGITECH_G502_PROTEUS_SPECTRUM_PID,           1, 0xFF00, 2);
 REGISTER_HID_DETECTOR_IPU("Logitech G502 HERO Gaming Mouse",                    DetectLogitechWired,        LOGITECH_VID, LOGITECH_G502_HERO_PID,                       1, 0xFF00, 2);
-
 REGISTER_HID_DETECTOR_IPU("Logitech G403 Prodigy Gaming Mouse",                 DetectLogitechWired,        LOGITECH_VID, LOGITECH_G403_PID,                            1, 0xFF00, 2);
 REGISTER_HID_DETECTOR_IPU("Logitech G403 Wireless Gaming Mouse (wired)",        DetectLogitechWired,        LOGITECH_VID, LOGITECH_G403_LIGHTSPEED_PID,                 1, 0xFF00, 2);
-REGISTER_HID_DETECTOR_IPU("Logitech G502 Wireless Gaming Mouse (wired)",        DetectLogitechWired,        LOGITECH_VID, LOGITECH_G502_LIGHTSPEED_PID,                 1, 0xFF00, 2);
 REGISTER_HID_DETECTOR_IPU("Logitech G703 Wireless Gaming Mouse (wired)",        DetectLogitechWired,        LOGITECH_VID, LOGITECH_G703_LIGHTSPEED_PID,                 1, 0xFF00, 2);
 REGISTER_HID_DETECTOR_IPU("Logitech G703 HERO Wireless Gaming Mouse (wired)",   DetectLogitechWired,        LOGITECH_VID, LOGITECH_G703_HERO_LIGHTSPEED_PID,            1, 0xFF00, 2);
 REGISTER_HID_DETECTOR_IPU("Logitech G900 Wireless Gaming Mouse (wired)",        DetectLogitechWired,        LOGITECH_VID, LOGITECH_G900_LIGHTSPEED_PID,                 1, 0xFF00, 2);
 REGISTER_HID_DETECTOR_IPU("Logitech G903 Wireless Gaming Mouse (wired)",        DetectLogitechWired,        LOGITECH_VID, LOGITECH_G903_LIGHTSPEED_PID,                 1, 0xFF00, 2);
-REGISTER_HID_DETECTOR_IPU("Logitech G903 HERO Wireless Gaming Mouse (wired)",   DetectLogitechWired,        LOGITECH_VID, LOGITECH_G903_LIGHTSPEED_HERO_PID,            1, 0xFF00, 2);
+REGISTER_HID_DETECTOR_IPU("Logitech G903 HERO Wireless Gaming Mouse (wired)",   DetectLogitechWired,        LOGITECH_VID, LOGITECH_G903_LIGHTSPEED_HERO_PID,            2, 0xFF00, 2);
 REGISTER_HID_DETECTOR_IPU("Logitech G Pro Wireless Gaming Mouse (wired)",       DetectLogitechWired,        LOGITECH_VID, LOGITECH_G_PRO_WIRELESS_PID,                  2, 0xFF00, 2);
 REGISTER_HID_DETECTOR_IPU("Logitech G633 Gaming Headset",                       DetectLogitechWired,        LOGITECH_VID, LOGITECH_G633_PID,                            3, 0xFF43, 514);
 REGISTER_HID_DETECTOR_IPU("Logitech G635 Gaming Headset",                       DetectLogitechWired,        LOGITECH_VID, LOGITECH_G635_PID,                            3, 0xFF43, 514);

Controllers/LogitechController/LogitechProtocolCommon.cpp

@@ -749,7 +749,7 @@ uint8_t logitech_device::setMode(uint8_t mode, uint16_t speed, uint8_t zone, uin
         set_mode.init(
             device_index,
             RGB_feature_index,
-            (fp8070 ? LOGITECH_FP8070_SET_EFFECT : LOGITECH_FP8071_SET_LED_EFFECT)
+            (fp8070 ? (uint8_t)LOGITECH_FP8070_SET_EFFECT : (uint8_t)LOGITECH_FP8071_SET_LED_EFFECT)
         );
         set_mode.data[0] = zone;
         set_mode.data[1] = mode;
@@ -867,7 +867,7 @@ uint8_t logitech_device::set8071Effects(uint8_t control)
     return result;
 }
 
-uint8_t logitech_device::set8071TimeoutControl(uint8_t control)
+uint8_t logitech_device::set8071TimeoutControl(uint8_t /*control*/)
 {
     int result = 0;
 

Controllers/MSI3ZoneController/RGBController_MSI3Zone.cpp

@@ -28,7 +28,7 @@ RGBController_MSI3Zone::RGBController_MSI3Zone(MSI3ZoneController* controller_pt
 
     name        = "MSI 3-Zone Keyboard";
     vendor      = "MSI";
-    type        = DEVICE_TYPE_KEYBOARD;
+    type        = DEVICE_TYPE_LAPTOP;
     description = "MSI 3-Zone Keyboard Device";
     location    = controller->GetDeviceLocation();
     serial      = controller->GetSerialString();

Controllers/MSIGPUController/MSIGPUController/MSIGPUControllerDetect.cpp

@@ -37,18 +37,18 @@ void DetectMSIGPUControllers(i2c_smbus_interface* bus, uint8_t i2c_addr, const s
 } /* DetectMSIGPUControllers() */
 
 /*-----------------------------------------*\
-|  NVidia GPUs                              |
+|  Nvidia GPUs                              |
 \*-----------------------------------------*/
 
 REGISTER_I2C_PCI_DETECTOR("MSI GeForce GTX 1070 Gaming X",                  DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_GTX1070_DEV,         MSI_SUB_VEN,    MSI_GTX1070_GAMING_X_SUB_DEV,           0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce GTX 1660 Gaming X 6G",               DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_GTX1660_DEV,         MSI_SUB_VEN,    MSI_GTX1660_GAMING_X_6G_SUB_DEV,        0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce GTX 1660 Ti Gaming 6G",              DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_GTX1660TI_DEV,       MSI_SUB_VEN,    MSI_GTX1660TI_GAMING_6G_SUB_DEV,        0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce GTX 1660 Ti Gaming X 6G",            DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_GTX1660TI_DEV,       MSI_SUB_VEN,    MSI_GTX1660TI_GAMING_X_6G_SUB_DEV,      0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce GTX 1660 SUPER Gaming 6G",           DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_GTX1660S_DEV,        MSI_SUB_VEN,    MSI_GTX1660S_GAMING_6G_SUB_DEV,         0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce GTX 1660 SUPER Gaming X 6G",         DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_GTX1660S_DEV,        MSI_SUB_VEN,    MSI_GTX1660S_GAMING_X_6G_SUB_DEV,       0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2060 Gaming Z 6G",               DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2060_TU104_DEV,   MSI_SUB_VEN,    MSI_RTX2060_GAMING_Z_6G_SUB_DEV,        0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2060 Gaming Z 6G",               DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2060_TU106_DEV,   MSI_SUB_VEN,    MSI_RTX2060_GAMING_Z_6G_SUB_DEV,        0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2060 Gaming Z 6G",               DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2060_TU106_DEV,   MSI_SUB_VEN,    MSI_RTX2060_GAMING_Z_6G_SUB_DEV_2,      0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce GTX 1660 Gaming X",                  DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_GTX1660_DEV,         MSI_SUB_VEN,    MSI_GTX1660_GAMING_X_6G_SUB_DEV,        0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce GTX 1660 Ti Gaming",                 DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_GTX1660TI_DEV,       MSI_SUB_VEN,    MSI_GTX1660TI_GAMING_6G_SUB_DEV,        0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce GTX 1660 Ti Gaming X",               DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_GTX1660TI_DEV,       MSI_SUB_VEN,    MSI_GTX1660TI_GAMING_X_6G_SUB_DEV,      0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce GTX 1660 SUPER Gaming",              DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_GTX1660S_DEV,        MSI_SUB_VEN,    MSI_GTX1660S_GAMING_6G_SUB_DEV,         0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce GTX 1660 SUPER Gaming X",            DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_GTX1660S_DEV,        MSI_SUB_VEN,    MSI_GTX1660S_GAMING_X_6G_SUB_DEV,       0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2060 Gaming Z",                  DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2060_TU104_DEV,   MSI_SUB_VEN,    MSI_RTX2060_GAMING_Z_6G_SUB_DEV,        0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2060 Gaming Z",                  DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2060_TU106_DEV,   MSI_SUB_VEN,    MSI_RTX2060_GAMING_Z_6G_SUB_DEV,        0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2060 Gaming Z",                  DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2060_TU106_DEV,   MSI_SUB_VEN,    MSI_RTX2060_GAMING_Z_6G_SUB_DEV_2,      0x68);
 REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2060 SUPER Gaming X",            DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2060S_OC_DEV,     MSI_SUB_VEN,    MSI_RTX2060S_GAMING_X_SUB_DEV,          0x68);
 REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2060 SUPER ARMOR OC",            DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2060S_OC_DEV,     MSI_SUB_VEN,    MSI_RTX2060S_ARMOR_OC_SUB_DEV,          0x68);
 REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2070 Gaming Z",                  DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2070_OC_DEV,      MSI_SUB_VEN,    MSI_RTX2070_GAMING_Z_SUB_DEV,           0x68);
@@ -65,56 +65,57 @@ REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2080 Gaming Trio",               Dete
 REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2080 Gaming X Trio",             DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2080_A_DEV,       MSI_SUB_VEN,    MSI_RTX2080_GAMING_X_TRIO_SUB_DEV,      0x68);
 REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2080 Gaming X Trio",             DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2080_A_DEV,       MSI_SUB_VEN,    MSI_RTX2080_GAMING_X_TRIO_SUB_DEV_2,    0x68);
 REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2080 Sea Hawk EK X",             DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2080_A_DEV,       MSI_SUB_VEN,    MSI_RTX2080_SEA_HAWK_EK_X_SUB_DEV,      0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2080 Duke 8G OC",                DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2080_A_DEV,       MSI_SUB_VEN,    MSI_RTX2080_DUKE_OC_SUB_DEV,            0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2080 Duke OC",                   DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2080_A_DEV,       MSI_SUB_VEN,    MSI_RTX2080_DUKE_OC_SUB_DEV,            0x68);
 REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2080 SUPER Gaming X Trio",       DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2080S_DEV,        MSI_SUB_VEN,    MSI_RTX2080S_GAMING_X_TRIO_SUB_DEV,     0x68);
 REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2080 Ti Gaming X Trio",          DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2080TI_A_DEV,     MSI_SUB_VEN,    MSI_RTX2080TI_GAMING_X_TRIO_SUB_DEV,    0x68);
 REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2080 Ti Gaming Z Trio",          DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2080TI_A_DEV,     MSI_SUB_VEN,    MSI_RTX2080TI_GAMING_Z_TRIO_SUB_DEV,    0X68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2080 Ti 11G Gaming X Trio",      DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2080TI_A_DEV,     MSI_SUB_VEN,    MSI_RTX2080TI_11G_GAMING_X_TRIO_SUB_DEV,0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2080 Ti Gaming X Trio",          DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2080TI_A_DEV,     MSI_SUB_VEN,    MSI_RTX2080TI_11G_GAMING_X_TRIO_SUB_DEV,0x68);
 REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 2080 Ti Sea Hawk EK X",          DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX2080TI_A_DEV,     MSI_SUB_VEN,    MSI_RTX2080TI_SEA_HAWK_EK_X_SUB_DEV,    0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3050 Gaming X 8G",               DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3050_DEV,         MSI_SUB_VEN,    MSI_RTX3060_GAMING_X_8G_SUB_DEV,        0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Gaming X 12G",              DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060_DEV,         MSI_SUB_VEN,    MSI_RTX3060_GAMING_X_12G_SUB_DEV,       0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Gaming X 12G LHR",          DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060_LHR_DEV,     MSI_SUB_VEN,    MSI_RTX3060_GAMING_X_12G_SUB_DEV,       0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Gaming X 12G (GA104)",      DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060_GA104_DEV,   MSI_SUB_VEN,    MSI_RTX3060_GAMING_X_12G_SUB_DEV,       0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 12G Gaming X Trio LHR",     DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060_LHR_DEV,     MSI_SUB_VEN,    MSI_RTX3070_GAMING_X_TRIO_SUB_DEV,      0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 12G Gaming X Trio",         DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060_DEV,         MSI_SUB_VEN,    MSI_RTX3070_GAMING_X_TRIO_SUB_DEV,      0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 12G Gaming Z Trio",         DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060_GA104_DEV,   MSI_SUB_VEN,    MSI_RTX3070_GAMING_X_TRIO_SUB_DEV,      0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Ti 8GB Gaming X",           DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060TI_DEV,       MSI_SUB_VEN,    MSI_RTX3060TI_GAMING_X_SUB_DEV,         0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Ti 8GB Gaming X Trio",      DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060TI_DEV,       MSI_SUB_VEN,    MSI_RTX3070_GAMING_X_TRIO_SUB_DEV,      0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Ti 8GB Gaming X LHR",       DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060TI_LHR_DEV,   MSI_SUB_VEN,    MSI_RTX3060TI_GAMING_X_SUB_DEV,         0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Ti 8GB Gaming X Trio LHR",  DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060TI_LHR_DEV,   MSI_SUB_VEN,    MSI_RTX3070_GAMING_X_TRIO_SUB_DEV,      0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Ti 8GB SUPER 3X OC",        DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060TI_GDDR6X_DEV,MSI_SUB_VEN,    MSI_RTX3060TI_SUPER_3X_OC_SUB_DEV,      0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Ti 8GB Gaming X Trio",      DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060TI_GDDR6X_DEV,MSI_SUB_VEN,    MSI_RTX3060TI_GAMING_X_TRIO_8G_SUB_DEV, 0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3070 8GB Gaming Trio",           DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3070_LHR_DEV,     MSI_SUB_VEN,    MSI_RTX3070_GAMING_TRIO_SUB_DEV,        0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3070 8GB Gaming X Trio",         DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3070_DEV,         MSI_SUB_VEN,    MSI_RTX3070_GAMING_X_TRIO_SUB_DEV,      0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3070 8GB Suprim",                DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3070_DEV,         MSI_SUB_VEN,    MSI_RTX3070_SUPRIM_SUB_DEV,             0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3070 8GB Suprim LHR",            DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3070_LHR_DEV,     MSI_SUB_VEN,    MSI_RTX3070_SUPRIM_SUB_DEV,             0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3070 8GB Suprim X",              DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3070_DEV,         MSI_SUB_VEN,    MSI_RTX3070_SUPRIM_X_SUB_DEV,           0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3070 8GB Suprim X LHR",          DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3070_LHR_DEV,     MSI_SUB_VEN,    MSI_RTX3070_SUPRIM_X_SUB_DEV,           0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3070 8GB Suprim X GODZILLA LHR", DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3070_LHR_DEV,     MSI_SUB_VEN,    MSI_RTX3070_SUPRIM_X_GODZILLA_SUB_DEV,  0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3070 Ti 8GB Gaming X Trio",      DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3070TI_DEV,       MSI_SUB_VEN,    MSI_RTX3070TI_GAMING_X_TRIO_SUB_DEV,    0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3070 Ti Suprim X 8G",            DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3070TI_DEV,       MSI_SUB_VEN,    MSI_RTX3070TI_SUPRIM_X_SUB_DEV,         0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3080 10GB Gaming Z Trio",        DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3080_DEV,         MSI_SUB_VEN,    MSI_RTX3080_GAMING_Z_TRIO_SUB_DEV,      0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3080 10GB Gaming Z Trio LHR",    DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3080_LHR_DEV,     MSI_SUB_VEN,    MSI_RTX3080_GAMING_Z_TRIO_SUB_DEV,      0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3080 10GB Gaming X Trio",        DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3080_DEV,         MSI_SUB_VEN,    MSI_RTX3080_GAMING_X_TRIO_SUB_DEV,      0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3080 Suprim X 10G",              DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3080_DEV,         MSI_SUB_VEN,    MSI_RTX3080_SUPRIM_X_SUB_DEV,           0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3080 Suprim X 10G LHR",          DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3080_LHR_DEV,     MSI_SUB_VEN,    MSI_RTX3080_SUPRIM_X_SUB_DEV,           0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3080 Suprim X 12G LHR",          DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3080_12G_LHR_DEV, MSI_SUB_VEN,    MSI_RTX3080_SUPRIM_X_SUB_DEV,           0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3050 Gaming X",                  DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3050_DEV,         MSI_SUB_VEN,    MSI_RTX3060_GAMING_X_8G_SUB_DEV,        0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Gaming X",                  DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060_DEV,         MSI_SUB_VEN,    MSI_RTX3060_GAMING_X_12G_SUB_DEV,       0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Gaming X LHR",              DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060_LHR_DEV,     MSI_SUB_VEN,    MSI_RTX3060_GAMING_X_12G_SUB_DEV,       0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Gaming X (GA104)",          DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060_GA104_DEV,   MSI_SUB_VEN,    MSI_RTX3060_GAMING_X_12G_SUB_DEV,       0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Gaming X Trio LHR",         DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060_LHR_DEV,     MSI_SUB_VEN,    MSI_RTX3070_GAMING_X_TRIO_SUB_DEV,      0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Gaming X Trio",             DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060_DEV,         MSI_SUB_VEN,    MSI_RTX3070_GAMING_X_TRIO_SUB_DEV,      0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Gaming Z Trio",             DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060_GA104_DEV,   MSI_SUB_VEN,    MSI_RTX3070_GAMING_X_TRIO_SUB_DEV,      0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Ti Gaming X",               DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060TI_DEV,       MSI_SUB_VEN,    MSI_RTX3060TI_GAMING_X_SUB_DEV,         0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Ti Gaming X Trio",          DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060TI_DEV,       MSI_SUB_VEN,    MSI_RTX3070_GAMING_X_TRIO_SUB_DEV,      0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Ti Gaming X LHR",           DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060TI_LHR_DEV,   MSI_SUB_VEN,    MSI_RTX3060TI_GAMING_X_SUB_DEV,         0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Ti Gaming X Trio LHR",      DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060TI_LHR_DEV,   MSI_SUB_VEN,    MSI_RTX3070_GAMING_X_TRIO_SUB_DEV,      0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Ti SUPER 3X OC",            DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060TI_GDDR6X_DEV,MSI_SUB_VEN,    MSI_RTX3060TI_SUPER_3X_OC_SUB_DEV,      0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3060 Ti Gaming X Trio",          DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3060TI_GDDR6X_DEV,MSI_SUB_VEN,    MSI_RTX3060TI_GAMING_X_TRIO_8G_SUB_DEV, 0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3070 Gaming Trio",               DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3070_LHR_DEV,     MSI_SUB_VEN,    MSI_RTX3070_GAMING_TRIO_SUB_DEV,        0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3070 Gaming X Trio",             DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3070_DEV,         MSI_SUB_VEN,    MSI_RTX3070_GAMING_X_TRIO_SUB_DEV,      0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3070 Suprim",                    DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3070_DEV,         MSI_SUB_VEN,    MSI_RTX3070_SUPRIM_SUB_DEV,             0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3070 Suprim LHR",                DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3070_LHR_DEV,     MSI_SUB_VEN,    MSI_RTX3070_SUPRIM_SUB_DEV,             0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3070 Suprim X",                  DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3070_DEV,         MSI_SUB_VEN,    MSI_RTX3070_SUPRIM_X_SUB_DEV,           0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3070 Suprim X LHR",              DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3070_LHR_DEV,     MSI_SUB_VEN,    MSI_RTX3070_SUPRIM_X_SUB_DEV,           0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3070 Suprim X GODZILLA LHR",     DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3070_LHR_DEV,     MSI_SUB_VEN,    MSI_RTX3070_SUPRIM_X_GODZILLA_SUB_DEV,  0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3070 Ti Gaming X Trio",          DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3070TI_DEV,       MSI_SUB_VEN,    MSI_RTX3070TI_GAMING_X_TRIO_SUB_DEV,    0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3070 Ti Suprim X",               DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3070TI_DEV,       MSI_SUB_VEN,    MSI_RTX3070TI_SUPRIM_X_SUB_DEV,         0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3080 Gaming Z Trio",             DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3080_DEV,         MSI_SUB_VEN,    MSI_RTX3080_GAMING_Z_TRIO_SUB_DEV,      0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3080 Gaming Z Trio LHR",         DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3080_LHR_DEV,     MSI_SUB_VEN,    MSI_RTX3080_GAMING_Z_TRIO_SUB_DEV,      0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3080 Gaming X Trio",             DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3080_DEV,         MSI_SUB_VEN,    MSI_RTX3080_GAMING_X_TRIO_SUB_DEV,      0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3080 Suprim X",                  DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3080_DEV,         MSI_SUB_VEN,    MSI_RTX3080_SUPRIM_X_SUB_DEV,           0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3080 Suprim X LHR",              DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3080_LHR_DEV,     MSI_SUB_VEN,    MSI_RTX3080_SUPRIM_X_SUB_DEV,           0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3080 12GB Suprim X LHR",         DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3080_12G_LHR_DEV, MSI_SUB_VEN,    MSI_RTX3080_SUPRIM_X_SUB_DEV,           0x68);
 REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3080 12GB Gaming Z Trio LHR",    DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3080_12G_LHR_DEV, MSI_SUB_VEN,    MSI_RTX3080_12G_GAMING_Z_TRIO_SUB_DEV,  0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3080 Ti Gaming X Trio 12G",      DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3080TI_DEV,       MSI_SUB_VEN,    MSI_RTX3080TI_GAMING_X_TRIO_SUB_DEV,    0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3080 Ti Suprim X 12G",           DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3080TI_DEV,       MSI_SUB_VEN,    MSI_RTX3080TI_SUPRIM_X_SUB_DEV,         0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3090 24GB Gaming X Trio",        DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3090_DEV,         MSI_SUB_VEN,    MSI_RTX3090_GAMING_X_TRIO_SUB_DEV,      0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3090 Suprim 24G",                DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3090_DEV,         MSI_SUB_VEN,    MSI_RTX3090_SUPRIM_SUB_DEV,             0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3090 Suprim X 24G",              DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3090_DEV,         MSI_SUB_VEN,    MSI_RTX3090_SUPRIM_X_SUB_DEV,           0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3090 Ti Suprim X 24G",           DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3090TI_DEV,       MSI_SUB_VEN,    MSI_RTX3090TI_SUPRIM_X_SUB_DEV,         0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3090 Ti Gaming X Trio 24G",      DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3090TI_DEV,       MSI_SUB_VEN,    MSI_RTX3090TI_GAMING_X_TRIO_SUB_DEV,    0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3080 Ti Gaming X Trio",          DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3080TI_DEV,       MSI_SUB_VEN,    MSI_RTX3080TI_GAMING_X_TRIO_SUB_DEV,    0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3080 Ti Suprim X",               DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3080TI_DEV,       MSI_SUB_VEN,    MSI_RTX3080TI_SUPRIM_X_SUB_DEV,         0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3090 Gaming X Trio",             DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3090_DEV,         MSI_SUB_VEN,    MSI_RTX3090_GAMING_X_TRIO_SUB_DEV,      0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3090 Suprim",                    DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3090_DEV,         MSI_SUB_VEN,    MSI_RTX3090_SUPRIM_SUB_DEV,             0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3090 Suprim X",                  DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3090_DEV,         MSI_SUB_VEN,    MSI_RTX3090_SUPRIM_X_SUB_DEV,           0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3090 Ti Suprim X",               DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3090TI_DEV,       MSI_SUB_VEN,    MSI_RTX3090TI_SUPRIM_X_SUB_DEV,         0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 3090 Ti Gaming X Trio",          DetectMSIGPUControllers,    NVIDIA_VEN,     NVIDIA_RTX3090TI_DEV,       MSI_SUB_VEN,    MSI_RTX3090TI_GAMING_X_TRIO_SUB_DEV,    0x68);
 
 /*-----------------------------------------*\
 |  AMD GPUs                                 |
 \*-----------------------------------------*/
 
 REGISTER_I2C_PCI_DETECTOR("MSI Radeon RX 6600 XT Gaming X",                 DetectMSIGPUControllers,    AMD_GPU_VEN,    AMD_NAVI23_DEV,             MSI_SUB_VEN,    MSI_RX6600XT_GAMING_X_SUB_DEV,          0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI Radeon RX 6650 XT Gaming X",                 DetectMSIGPUControllers,    AMD_GPU_VEN,    AMD_NAVI23_DEV1,            MSI_SUB_VEN,    MSI_RX6650XT_GAMING_X_SUB_DEV,          0x68);
 REGISTER_I2C_PCI_DETECTOR("MSI Radeon RX 6700 XT Gaming X",                 DetectMSIGPUControllers,    AMD_GPU_VEN,    AMD_NAVI22_DEV,             MSI_SUB_VEN,    MSI_RX6700XT_GAMING_X_SUB_DEV,          0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI Radeon RX 6750 XT Gaming X Trio 12G",        DetectMSIGPUControllers,    AMD_GPU_VEN,    AMD_NAVI22_DEV,             MSI_SUB_VEN,    MSI_RX6750XT_GAMING_X_TRIO_SUB_DEV,     0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI Radeon RX 6750 XT Gaming X Trio",            DetectMSIGPUControllers,    AMD_GPU_VEN,    AMD_NAVI22_DEV,             MSI_SUB_VEN,    MSI_RX6750XT_GAMING_X_TRIO_SUB_DEV,     0x68);
 REGISTER_I2C_PCI_DETECTOR("MSI Radeon RX 6800 Gaming Z Trio v1",            DetectMSIGPUControllers,    AMD_GPU_VEN,    AMD_NAVI21_DEV1,            MSI_SUB_VEN,    MSI_RX6800_GAMING_Z_TRIO_V1_SUB_DEV,    0x68);
 REGISTER_I2C_PCI_DETECTOR("MSI Radeon RX 6800 Gaming X Trio",               DetectMSIGPUControllers,    AMD_GPU_VEN,    AMD_NAVI21_DEV1,            MSI_SUB_VEN,    MSI_RX6800_GAMING_X_TRIO_SUB_DEV,       0x68);
 REGISTER_I2C_PCI_DETECTOR("MSI Radeon RX 6800 XT Gaming X Trio",            DetectMSIGPUControllers,    AMD_GPU_VEN,    AMD_NAVI21_DEV1,            MSI_SUB_VEN,    MSI_RX6800XT_GAMING_X_TRIO_SUB_DEV,     0x68);
@@ -123,3 +124,4 @@ REGISTER_I2C_PCI_DETECTOR("MSI Radeon RX 6900 XT Gaming X Trio",            Dete
 REGISTER_I2C_PCI_DETECTOR("MSI Radeon RX 6900 XT Gaming Z Trio",            DetectMSIGPUControllers,    AMD_GPU_VEN,    AMD_NAVI21_DEV2,            MSI_SUB_VEN,    MSI_RX6950XT_GAMING_X_TRIO_SUB_DEV,     0x68);
 REGISTER_I2C_PCI_DETECTOR("MSI Radeon RX 6950 XT Gaming X Trio",            DetectMSIGPUControllers,    AMD_GPU_VEN,    AMD_NAVI21_DEV1,            MSI_SUB_VEN,    MSI_RX6950XT_GAMING_X_TRIO_SUB_DEV,     0x68);
 REGISTER_I2C_PCI_DETECTOR("MSI Radeon RX 6950 XT Gaming X Trio",            DetectMSIGPUControllers,    AMD_GPU_VEN,    AMD_NAVI21_DEV3,            MSI_SUB_VEN,    MSI_RX6950XT_GAMING_X_TRIO_SUB_DEV,     0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI Radeon RX 7900 XT Gaming Trio Classic",      DetectMSIGPUControllers,    AMD_GPU_VEN,    AMD_NAVI31_DEV,             MSI_SUB_VEN,    MSI_RX7900XT_GAMING_TRIO_CLASSIC_SUB_DEV,0x68);

Controllers/MSIGPUController/MSIGPUv2Controller/MSIGPUv2Controller.cpp

@@ -10,6 +10,7 @@
 \*---------------------------------------------------------*/
 
 #include <cstring>
+#include <chrono>
 #include "MSIGPUv2Controller.h"
 
 using namespace std::chrono_literals;

Controllers/MSIGPUController/MSIGPUv2Controller/MSIGPUv2ControllerDetect.cpp

@@ -39,31 +39,36 @@ void DetectMSIGPUv2Controllers(i2c_smbus_interface* bus, uint8_t i2c_addr, const
 
 } /* DetectMSIGPUv2Controllers() */
 
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4060 8GB Gaming X",                      DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4060_DEV,         MSI_SUB_VEN,    MSI_RTX4060_GAMING_X_8G_SUB_DEV,               0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4060 Ti 8GB Gaming X",                   DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4060TI_DEV,       MSI_SUB_VEN,    MSI_RTX4060TI_GAMING_X_8G_SUB_DEV,             0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4060 Gaming X",                          DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4060_DEV,         MSI_SUB_VEN,    MSI_RTX4060_GAMING_X_8G_SUB_DEV,               0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4060 Ti Gaming X",                       DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4060TI_DEV,       MSI_SUB_VEN,    MSI_RTX4060TI_GAMING_X_8G_SUB_DEV,             0x68);
 REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4060 Ti 16GB Gaming X",                  DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4060TI_16G_DEV,   MSI_SUB_VEN,    MSI_RTX4060TI_GAMING_X_16G_SUB_DEV,            0x68);
 REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4060 Ti 16GB Gaming X Slim White",       DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4060TI_16G_DEV,   MSI_SUB_VEN,    MSI_RTX4060TI_GAMING_X_16G_SLIM_WHITE_SUB_DEV, 0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 12GB Gaming X Trio",                DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070_DEV,         MSI_SUB_VEN,    MSI_RTX4070_GAMING_X_TRIO_SUB_DEV,             0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 12GB Gaming X Slim",                DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070_DEV,         MSI_SUB_VEN,    MSI_RTX4070S_GAMING_X_SLIM_SUB_DEV,            0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 SUPER 12GB Gaming X Slim",          DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070S_DEV,        MSI_SUB_VEN,    MSI_RTX4070S_GAMING_X_SLIM_SUB_DEV,            0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 SUPER 12GB Gaming X Slim White",    DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070S_DEV,        MSI_SUB_VEN,    MSI_RTX4070S_GAMING_X_SLIM_WHITE_SUB_DEV,      0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Ti 12GB Gaming X Trio",             DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070TI_DEV,       MSI_SUB_VEN,    MSI_RTX4070TI_GAMING_X_TRIO_SUB_DEV,           0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Ti 12GB Gaming X Trio White",       DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070TI_DEV,       MSI_SUB_VEN,    MSI_RTX4070TI_GAMING_X_TRIO_WHITE_SUB_DEV,     0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Ti 12GB Gaming X Slim White",       DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070TI_DEV,       MSI_SUB_VEN,    MSI_RTX4070TI_GAMING_X_SLIM_WHITE_SUB_DEV,     0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Ti 12GB Suprim X Trio",             DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070TI_DEV,       MSI_SUB_VEN,    MSI_RTX4070TI_SUPRIM_X_TRIO_SUB_DEV,           0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Ti SUPER 16GB Gaming X Trio White", DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070TIS_DEV,      MSI_SUB_VEN,    MSI_RTX4070TI_GAMING_X_TRIO_WHITE_SUB_DEV,     0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Ti SUPER 16GB Gaming Slim",         DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070TIS_DEV,      MSI_SUB_VEN,    MSI_RTX4070TIS_GAMING_SLIM_SUB_DEV,            0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Ti SUPER 16GB Gaming X Slim",       DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070TIS_DEV,      MSI_SUB_VEN,    MSI_RTX4070TIS_GAMING_X_SLIM_SUB_DEV,          0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Ti SUPER 16GB Gaming White X Slim", DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070TIS_DEV,      MSI_SUB_VEN,    MSI_RTX4070TIS_GAMING_X_SLIM_WHITE_SUB_DEV,    0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4080 16GB Gaming X Slim White",          DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4080_DEV,         MSI_SUB_VEN,    MSI_RTX4080S_GAMING_X_SLIM_WHITE_SUB_DEV,      0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4080 16GB Gaming X Trio",                DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4080_DEV,         MSI_SUB_VEN,    MSI_RTX4080_GAMING_X_TRIO_SUB_DEV,             0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4080 16GB Gaming X Trio White",          DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4080_DEV,         MSI_SUB_VEN,    MSI_RTX4080_GAMING_X_TRIO_WHITE_SUB_DEV,       0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4080 16GB Suprim X",                     DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4080_DEV,         MSI_SUB_VEN,    MSI_RTX4080_SUPRIM_X_SUB_DEV,                  0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4080 SUPER 16GB Gaming X Slim",          DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4080S_DEV,        MSI_SUB_VEN,    MSI_RTX4080S_GAMING_X_SLIM_SUB_DEV,            0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4080 SUPER 16GB Gaming X Slim White",    DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4080S_DEV,        MSI_SUB_VEN,    MSI_RTX4080S_GAMING_X_SLIM_WHITE_SUB_DEV,      0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4080 SUPER 16GB Suprim X",               DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4080S_DEV,        MSI_SUB_VEN,    MSI_RTX4080_SUPRIM_X_SUB_DEV,                  0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4080 SUPER 16GB Gaming X Trio",          DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4080S_DEV,        MSI_SUB_VEN,    MSI_RTX4080S_GAMING_X_TRIO_SUB_DEV,            0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4090 24GB Gaming X Trio",                DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4090_DEV,         MSI_SUB_VEN,    MSI_RTX4090_GAMING_X_TRIO_SUB_DEV,             0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4090 24GB Gaming X Slim",                DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4090_DEV,         MSI_SUB_VEN,    MSI_RTX4090_GAMING_X_SLIM_SUB_DEV,             0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4090 24GB Suprim Liquid X",              DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4090_DEV,         MSI_SUB_VEN,    MSI_RTX4090_SUPRIM_LIQUID_X_SUB_DEV,           0x68);
-REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4090 24GB Suprim X",                     DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4090_DEV,         MSI_SUB_VEN,    MSI_RTX4090_SUPRIM_X_SUB_DEV,                  0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Gaming X Trio",                     DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070_DEV,         MSI_SUB_VEN,    MSI_RTX4070_GAMING_X_TRIO_SUB_DEV,             0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Gaming X Slim",                     DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070_DEV,         MSI_SUB_VEN,    MSI_RTX4070S_GAMING_X_SLIM_SUB_DEV,            0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Gaming X Slim White",               DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070_DEV,         MSI_SUB_VEN,    MSI_RTX4070S_GAMING_X_SLIM_WHITE_SUB_DEV,      0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 SUPER Gaming X Slim",               DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070S_DEV,        MSI_SUB_VEN,    MSI_RTX4070S_GAMING_X_SLIM_SUB_DEV,            0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 SUPER Gaming X Slim White",         DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070S_DEV,        MSI_SUB_VEN,    MSI_RTX4070S_GAMING_X_SLIM_WHITE_SUB_DEV,      0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Ti Gaming X Trio",                  DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070TI_DEV,       MSI_SUB_VEN,    MSI_RTX4070TI_GAMING_X_TRIO_SUB_DEV,           0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Ti Gaming X Trio White",            DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070TI_DEV,       MSI_SUB_VEN,    MSI_RTX4070TI_GAMING_X_TRIO_WHITE_SUB_DEV,     0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Ti Gaming X Slim White",            DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070TI_DEV,       MSI_SUB_VEN,    MSI_RTX4070TI_GAMING_X_SLIM_WHITE_SUB_DEV,     0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Ti Suprim X Trio",                  DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070TI_DEV,       MSI_SUB_VEN,    MSI_RTX4070TI_SUPRIM_X_TRIO_SUB_DEV,           0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Ti SUPER Gaming X Trio White",      DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070TIS_DEV,      MSI_SUB_VEN,    MSI_RTX4070TI_GAMING_X_TRIO_WHITE_SUB_DEV,     0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Ti SUPER Gaming Slim",              DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070TIS_DEV,      MSI_SUB_VEN,    MSI_RTX4070TIS_GAMING_SLIM_SUB_DEV,            0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Ti SUPER Gaming X Slim",            DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070TIS_DEV,      MSI_SUB_VEN,    MSI_RTX4070TIS_GAMING_X_SLIM_SUB_DEV,          0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4070 Ti SUPER Gaming White X Slim",      DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4070TIS_DEV,      MSI_SUB_VEN,    MSI_RTX4070TIS_GAMING_X_SLIM_WHITE_SUB_DEV,    0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4080 Gaming X Slim White",               DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4080_DEV,         MSI_SUB_VEN,    MSI_RTX4080S_GAMING_X_SLIM_WHITE_SUB_DEV,      0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4080 Gaming X Trio",                     DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4080_DEV,         MSI_SUB_VEN,    MSI_RTX4080_GAMING_X_TRIO_SUB_DEV,             0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4080 Gaming X Trio White",               DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4080_DEV,         MSI_SUB_VEN,    MSI_RTX4080_GAMING_X_TRIO_WHITE_SUB_DEV,       0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4080 Suprim X",                          DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4080_DEV,         MSI_SUB_VEN,    MSI_RTX4080_SUPRIM_X_SUB_DEV,                  0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4080 SUPER Gaming X Slim",               DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4080S_DEV,        MSI_SUB_VEN,    MSI_RTX4080S_GAMING_X_SLIM_SUB_DEV,            0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4080 SUPER Gaming X Slim White",         DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4080S_DEV,        MSI_SUB_VEN,    MSI_RTX4080S_GAMING_X_SLIM_WHITE_SUB_DEV,      0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4080 SUPER Suprim X",                    DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4080S_DEV,        MSI_SUB_VEN,    MSI_RTX4080_SUPRIM_X_SUB_DEV,                  0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4080 SUPER Gaming X Trio",               DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4080S_DEV,        MSI_SUB_VEN,    MSI_RTX4080S_GAMING_X_TRIO_SUB_DEV,            0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4090 Gaming X Trio",                     DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4090_DEV,         MSI_SUB_VEN,    MSI_RTX4090_GAMING_X_TRIO_SUB_DEV,             0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4090 Gaming X Slim",                     DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4090_DEV,         MSI_SUB_VEN,    MSI_RTX4090_GAMING_X_SLIM_SUB_DEV,             0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4090 Suprim Liquid X",                   DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4090_DEV,         MSI_SUB_VEN,    MSI_RTX4090_SUPRIM_LIQUID_X_SUB_DEV,           0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 4090 Suprim X",                          DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX4090_DEV,         MSI_SUB_VEN,    MSI_RTX4090_SUPRIM_X_SUB_DEV,                  0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 5070 Ti Gaming Trio OC Plus",            DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX5070TI_DEV,       MSI_SUB_VEN,    MSI_RTX5070TI_GAMING_TRIO_SUB_DEV,             0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 5080 Gaming Trio OC",                    DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX5080_DEV,         MSI_SUB_VEN,    MSI_RTX5080_GAMING_TRIO_OC_SUB_DEV,            0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 5090 Gaming Trio OC",                    DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX5090_DEV,         MSI_SUB_VEN,    MSI_RTX5090_GAMING_TRIO_SUB_DEV,               0x68);
+REGISTER_I2C_PCI_DETECTOR("MSI GeForce RTX 5090 SUPRIM LIQUID SOC",                 DetectMSIGPUv2Controllers,    NVIDIA_VEN,     NVIDIA_RTX5090_DEV,         MSI_SUB_VEN,    MSI_RTX5090_SUPRIM_LIQUID_SOC_SUB_DEV,         0x68);

Controllers/MSIMysticLightController/MSIMysticLight185Controller/RGBController_MSIMysticLight185.cpp

@@ -147,23 +147,37 @@ void RGBController_MSIMysticLight185::SetupZones()
             zone new_zone;
 
             new_zone.name           = zd->name;
+            new_zone.flags          = 0;
 
             int maxLeds = (int)controller->GetMaxDirectLeds(zd->zone_type);
 
             /*-------------------------------------------------*\
             | This is a fixed size zone                         |
-            |   Either this is a board which only supports zone |
-            |   control or this is not an ARGB header zone      |
             \*-------------------------------------------------*/
-            if((controller->GetSupportedDirectMode() == MSIMysticLight185Controller::DIRECT_MODE_ZONE_BASED)
-            || ((zd->zone_type != MSI_ZONE_J_RAINBOW_1) && (zd->zone_type != MSI_ZONE_J_RAINBOW_2) && (zd->zone_type != MSI_ZONE_J_RAINBOW_3) && (zd->zone_type != MSI_ZONE_J_CORSAIR)))
+            if(((zd->zone_type != MSI_ZONE_J_RAINBOW_1)
+             && (zd->zone_type != MSI_ZONE_J_RAINBOW_2)
+             && (zd->zone_type != MSI_ZONE_J_RAINBOW_3)
+             && (zd->zone_type != MSI_ZONE_J_CORSAIR)))
             {
                 new_zone.leds_min   = maxLeds;
                 new_zone.leds_max   = maxLeds;
                 new_zone.leds_count = maxLeds;
             }
             /*--------------------------------------------------\
-            | This is a resizable zone on a per-LED board       |
+            | This is a resizable zone on a board that does not |
+            | support per-LED direct mode                       |
+            \*-------------------------------------------------*/
+            else if(controller->GetSupportedDirectMode() == MSIMysticLight185Controller::DIRECT_MODE_ZONE_BASED)
+            {
+                new_zone.leds_min   = 0;
+                new_zone.leds_max   = 30;//maxLeds;
+                new_zone.leds_count = 0;
+                last_resizable_zone = zd->zone_type;
+                new_zone.flags     |= ZONE_FLAG_RESIZE_EFFECTS_ONLY;
+            }
+            /*--------------------------------------------------\
+            | This is a resizable zone on a board that does     |
+            | support per-LED direct mode                       |
             \*-------------------------------------------------*/
             else
             {
@@ -176,7 +190,7 @@ void RGBController_MSIMysticLight185::SetupZones()
             /*-------------------------------------------------*\
             | Determine zone type based on max number of LEDs   |
             \*-------------------------------------------------*/
-            if(new_zone.leds_max == 1)
+            if((new_zone.leds_max == 1) || (new_zone.flags & ZONE_FLAG_RESIZE_EFFECTS_ONLY))
             {
                 new_zone.type       = ZONE_TYPE_SINGLE;
             }
@@ -199,16 +213,28 @@ void RGBController_MSIMysticLight185::SetupZones()
     {
         controller->SetCycleCount(zone_description[zone_idx]->zone_type, zones[zone_idx].leds_count);
 
-        for(std::size_t led_idx = 0; led_idx < zones[zone_idx].leds_count; ++led_idx)
+        if((zones[zone_idx].flags & ZONE_FLAG_RESIZE_EFFECTS_ONLY) == 0)
+        {
+            for(std::size_t led_idx = 0; led_idx < zones[zone_idx].leds_count; ++led_idx)
+            {
+                led new_led;
+
+                new_led.name = zones[zone_idx].name;
+
+                if(zones[zone_idx].leds_count > 1)
+                {
+                    new_led.name.append(" LED " + std::to_string(led_idx + 1));
+                }
+
+                new_led.value = zone_description[zone_idx]->zone_type;
+                leds.push_back(new_led);
+            }
+        }
+        else if(zones[zone_idx].leds_count > 0)
         {
             led new_led;
 
-            new_led.name = zones[zone_idx].name + " LED ";
-
-            if(zones[zone_idx].leds_count > 1)
-            {
-                new_led.name.append(std::to_string(led_idx + 1));
-            }
+            new_led.name = zones[zone_idx].name;
 
             new_led.value = zone_description[zone_idx]->zone_type;
             leds.push_back(new_led);

Controllers/MintakaKeyboardController/RGBController_MintakaKeyboard.cpp

@@ -34,22 +34,26 @@ layout_values mintaka_offset_values =
     },
     {
         { KEYBOARD_LAYOUT_ISO_QWERTY, {
-            {   0,      1,      11,         0,          KEY_EN_QUOTE,                    KEYBOARD_OPCODE_SWAP_ONLY,          },
-            {   0,      1,      12,         0,          KEY_ES_OPEN_QUESTION_MARK,       KEYBOARD_OPCODE_SWAP_ONLY,          },
+            /*-------------------------------------------------------------------------------------------------------------------------------------*\
+            | Edit Keys                                                                                                                             |
+            |   Zone,   Row,    Column,     Value,      Name,                       Alternate Name,             OpCode                              |
+            \*-------------------------------------------------------------------------------------------------------------------------------------*/
+            {   0,      1,      11,         0,          KEY_EN_QUOTE,               KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
+            {   0,      1,      12,         0,          KEY_ES_OPEN_QUESTION_MARK,  KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
 
-            {   0,      2,      11,         0,          KEY_ES_TILDE,                    KEYBOARD_OPCODE_SWAP_ONLY,          },
-            {   0,      2,      12,         0,          KEY_EN_PLUS,                     KEYBOARD_OPCODE_SWAP_ONLY,          },
+            {   0,      2,      11,         0,          KEY_ES_TILDE,               KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
+            {   0,      2,      12,         0,          KEY_EN_PLUS,                KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
 
-            {   0,      3,      10,         0,          KEY_ES_ENIE,                     KEYBOARD_OPCODE_SWAP_ONLY,          },
-            {   0,      3,      11,         0,          KEY_EN_LEFT_BRACKET,             KEYBOARD_OPCODE_SWAP_ONLY,          },
-            {   0,      3,      12,         0,          KEY_EN_RIGHT_BRACKET,            KEYBOARD_OPCODE_SWAP_ONLY,          },
+            {   0,      3,      10,         0,          KEY_ES_ENIE,                KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
+            {   0,      3,      11,         0,          KEY_EN_LEFT_BRACKET,        KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
+            {   0,      3,      12,         0,          KEY_EN_RIGHT_BRACKET,       KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
 
-            {   0,      4,       1,         0,          KEY_NORD_ANGLE_BRACKET,          KEYBOARD_OPCODE_SWAP_ONLY,          },
-            {   0,      4,      11,         0,          KEY_NORD_HYPHEN,                 KEYBOARD_OPCODE_SWAP_ONLY,          },
+            {   0,      4,       1,         0,          KEY_NORD_ANGLE_BRACKET,     KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
+            {   0,      4,      11,         0,          KEY_NORD_HYPHEN,            KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
 
-            {   0,      5,      11,         0,          KEY_EN_MENU,                     KEYBOARD_OPCODE_SWAP_ONLY,          },
-            {   0,      5,      12,         0,          KEY_EN_RIGHT_CONTROL,            KEYBOARD_OPCODE_SWAP_ONLY,          },
-            {   0,      5,      13,         0,          KEY_EN_RIGHT_FUNCTION,           KEYBOARD_OPCODE_SWAP_ONLY,          },
+            {   0,      5,      11,         0,          KEY_EN_MENU,                KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
+            {   0,      5,      12,         0,          KEY_EN_RIGHT_CONTROL,       KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
+            {   0,      5,      13,         0,          KEY_EN_RIGHT_FUNCTION,      KEY_EN_UNUSED,              KEYBOARD_OPCODE_SWAP_ONLY,          },
         }}
     }
 };

Controllers/MountainKeyboardController/RGBController_MountainKeyboard.cpp

@@ -379,7 +379,7 @@ static const mountain_zone_t zone_definitions[] =
     {
         "Wheel Selector",
         ZONE_TYPE_SINGLE,
-        nullptr,
+        NULL,
         (unsigned int *) &single_wheel_lut,
         1,
         1,
@@ -713,10 +713,14 @@ void RGBController_MountainKeyboard::SetupZones()
         new_zone.leds_min               = zone_definitions[zone_idx].size;
         new_zone.leds_max               = zone_definitions[zone_idx].size;
         new_zone.leds_count             = zone_definitions[zone_idx].size;
-        new_zone.matrix_map             = new matrix_map_type;
-        new_zone.matrix_map->height     = zone_definitions[zone_idx].height;
-        new_zone.matrix_map->width      = zone_definitions[zone_idx].width;
-        new_zone.matrix_map->map        = zone_definitions[zone_idx].ptr;
+        new_zone.matrix_map             = NULL;
+        if (zone_definitions[zone_idx].type == ZONE_TYPE_MATRIX)
+        {
+            new_zone.matrix_map             = new matrix_map_type;
+            new_zone.matrix_map->height     = zone_definitions[zone_idx].height;
+            new_zone.matrix_map->width      = zone_definitions[zone_idx].width;
+            new_zone.matrix_map->map        = zone_definitions[zone_idx].ptr;
+        }
         zones.push_back(new_zone);
     }
 

Controllers/NVIDIAIlluminationController/NVIDIAIlluminationControllerDetect_Windows_Linux.cpp

@@ -42,37 +42,42 @@ typedef struct
 
 static const nv_gpu_pci_device device_list[] =
 {
-    {NVIDIA_VEN,    NVIDIA_RTX2060_TU106_DEV,       NVIDIA_VEN,       NVIDIA_RTX2060_FE_SUB_DEV,                      NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 2060 FE"                  },
-    {NVIDIA_VEN,    NVIDIA_RTX2060S_OC_DEV,         NVIDIA_VEN,       NVIDIA_RTX2060S_FE_SUB_DEV,                     NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 2060 SUPER FE"            },
-    {NVIDIA_VEN,    NVIDIA_RTX2070_OC_DEV,          NVIDIA_VEN,       NVIDIA_RTX2070_FE_SUB_DEV,                      NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 2070 FE"                  },
-    {NVIDIA_VEN,    NVIDIA_RTX2070S_DEV,            NVIDIA_VEN,       NVIDIA_RTX2070_FE_SUPER_SUB_DEV,                NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 2070 SUPER FE"            },
-    {NVIDIA_VEN,    NVIDIA_RTX2080_A_DEV,           NVIDIA_VEN,       NVIDIA_RTX2080_FE_SUB_DEV,                      NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 2080 FE"                  },
-    {NVIDIA_VEN,    NVIDIA_RTX2080S_DEV,            NVIDIA_VEN,       NVIDIA_RTX2080S_FE_SUB_DEV,                     NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 2080 SUPER FE"            },
-    {NVIDIA_VEN,    NVIDIA_RTX2080TI_A_DEV,         NVIDIA_VEN,       NVIDIA_RTX2080TI_FE_SUB_DEV,                    NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 2080 Ti FE"               },
-    {NVIDIA_VEN,    NVIDIA_RTX3050_DEV,             NVIDIA_VEN,       GAINWARD_RTX3050_SUB_DEV,                       NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "Gainward GeForce RTX 3050 LHR"               },
-    {NVIDIA_VEN,    NVIDIA_RTX3060_LHR_DEV,         NVIDIA_VEN,       NVIDIA_RTX3060_LHR_DEV,                         NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "Palit GeForce RTX 3060 LHR"                  },
+    {NVIDIA_VEN,    NVIDIA_RTX2060_TU104_DEV,       NVIDIA_SUB_VEN,   NVIDIA_RTX2060_TU104_DEV,                       NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "Palit GeForce RTX 2060"                      },
+    {NVIDIA_VEN,    NVIDIA_RTX2060_TU106_DEV,       NVIDIA_SUB_VEN,   NVIDIA_RTX2060_FE_SUB_DEV,                      NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 2060 FE"                  },
+    {NVIDIA_VEN,    NVIDIA_RTX2060S_OC_DEV,         NVIDIA_SUB_VEN,   NVIDIA_RTX2060S_FE_SUB_DEV,                     NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 2060 SUPER FE"            },
+    {NVIDIA_VEN,    NVIDIA_RTX2070_OC_DEV,          NVIDIA_SUB_VEN,   NVIDIA_RTX2070_FE_SUB_DEV,                      NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 2070 FE"                  },
+    {NVIDIA_VEN,    NVIDIA_RTX2070S_DEV,            NVIDIA_SUB_VEN,   NVIDIA_RTX2070_FE_SUPER_SUB_DEV,                NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 2070 SUPER FE"            },
+    {NVIDIA_VEN,    NVIDIA_RTX2080_A_DEV,           NVIDIA_SUB_VEN,   NVIDIA_RTX2080_FE_SUB_DEV,                      NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 2080 FE"                  },
+    {NVIDIA_VEN,    NVIDIA_RTX2080S_DEV,            NVIDIA_SUB_VEN,   NVIDIA_RTX2080S_FE_SUB_DEV,                     NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 2080 SUPER FE"            },
+    {NVIDIA_VEN,    NVIDIA_RTX2080TI_A_DEV,         NVIDIA_SUB_VEN,   NVIDIA_RTX2080TI_FE_SUB_DEV,                    NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 2080 Ti FE"               },
+    {NVIDIA_VEN,    NVIDIA_TITANRTX_DEV,            NVIDIA_SUB_VEN,   NVIDIA_TITANRTX_FE_SUB_DEV,                     NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA TITAN RTX"                            },
+    {NVIDIA_VEN,    NVIDIA_RTX3050_DEV,             NVIDIA_SUB_VEN,   GAINWARD_RTX3050_SUB_DEV,                       NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "Gainward GeForce RTX 3050 LHR"               },
+    {NVIDIA_VEN,    NVIDIA_RTX3060_8G_DEV,          NVIDIA_SUB_VEN,   NVIDIA_RTX3060_8G_DEV,                          NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "Gainward GeForce RTX 3060 Pegasus"           },
+    {NVIDIA_VEN,    NVIDIA_RTX3060_LHR_DEV,         NVIDIA_SUB_VEN,   NVIDIA_RTX3060_LHR_DEV,                         NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "Palit GeForce RTX 3060 LHR"                  },
     {NVIDIA_VEN,    NVIDIA_RTX3060_LHR_DEV,         PNY_SUB_VEN,      PNY_RTX_3060_XLR8_REVEL_EPIC_X_SUB_DEV,         NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "PNY GeForce RTX 3060 XLR8 REVEL EPIC-X"      },
     {NVIDIA_VEN,    NVIDIA_RTX3060_GA104_DEV,       PNY_SUB_VEN,      PNY_RTX_3060_XLR8_REVEL_EPIC_X_SUB_DEV,         NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "PNY GeForce RTX 3060 XLR8 REVEL EPIC-X"      },
-    {NVIDIA_VEN,    NVIDIA_RTX3060_GA104_DEV,       NVIDIA_VEN,       NVIDIA_RTX3060_GA104_DEV,                       NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "Palit GeForce RTX 3060 LHR (GA104)"          },
+    {NVIDIA_VEN,    NVIDIA_RTX3060_GA104_DEV,       NVIDIA_SUB_VEN,   NVIDIA_RTX3060_GA104_DEV,                       NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "Palit GeForce RTX 3060 LHR"                  },
     {NVIDIA_VEN,    NVIDIA_RTX3060TI_LHR_DEV,       PNY_SUB_VEN,      PNY_RTX_3060TI_XLR8_REVEL_EPIC_X_SUB_DEV,       NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "PNY GeForce RTX 3060 Ti XLR8 REVEL EPIC-X"   },
-    {NVIDIA_VEN,    NVIDIA_RTX3060TI_LHR_DEV,       NVIDIA_VEN,       PNY_RTX_3060TI_XLR8_REVEL_EPIC_X_SUB_DEV,       NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "PNY GeForce RTX 3060 Ti XLR8 REVEL EPIC-X"   },
-    {NVIDIA_VEN,    NVIDIA_RTX3060TI_V1_LHR_DEV,    NVIDIA_VEN,       NVIDIA_RTX3060TI_V1_LHR_DEV,                    NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "NVIDIA GeForce RTX 3060 Ti V1 LHR"           },
-    {NVIDIA_VEN,    NVIDIA_RTX3060TI_LHR_DEV,       NVIDIA_VEN,       NVIDIA_RTX3060TI_LHR_DEV,                       NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "NVIDIA GeForce RTX 3060 Ti LHR"              },
+    {NVIDIA_VEN,    NVIDIA_RTX3060TI_LHR_DEV,       NVIDIA_SUB_VEN,   PNY_RTX_3060TI_XLR8_REVEL_EPIC_X_SUB_DEV,       NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "PNY GeForce RTX 3060 Ti XLR8 REVEL EPIC-X"   },
+    {NVIDIA_VEN,    NVIDIA_RTX3060TI_V1_LHR_DEV,    NVIDIA_SUB_VEN,   NVIDIA_RTX3060TI_V1_LHR_DEV,                    NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "NVIDIA GeForce RTX 3060 Ti V1 LHR"           },
+    {NVIDIA_VEN,    NVIDIA_RTX3060TI_LHR_DEV,       NVIDIA_SUB_VEN,   NVIDIA_RTX3060TI_LHR_DEV,                       NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "NVIDIA GeForce RTX 3060 Ti LHR"              },
     {NVIDIA_VEN,    NVIDIA_RTX3070TI_DEV,           PNY_SUB_VEN,      PNY_RTX_3070TI_XLR8_UPRISING_EPIC_X_SUB_DEV,    NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "PNY GeForce RTX 3070 Ti XLR8 Uprising EPIC-X"},
-    {NVIDIA_VEN,    NVIDIA_RTX3080_DEV,             NVIDIA_VEN,       NVIDIA_RTX3080_FE_SUB_DEV,                      NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 3080 FE"                  },
-    {NVIDIA_VEN,    NVIDIA_RTX3080TI_DEV,           NVIDIA_VEN,       NVIDIA_RTX3080TI_FE_SUB_DEV,                    NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 3080 Ti FE"               },
-    {NVIDIA_VEN,    NVIDIA_RTX3080TI_DEV,           NVIDIA_VEN,       MANLI_RTX3080TI_GALLARDO_SUB_DEV,               NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "MANLI GeForce RTX 3080 Ti GALLARDO"          },
-    {NVIDIA_VEN,    NVIDIA_RTX3090_DEV,             NVIDIA_VEN,       NVIDIA_RTX3090_FE_SUB_DEV,                      NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 3090 FE"                  },
-    {NVIDIA_VEN,    NVIDIA_RTX3090TI_DEV,           NVIDIA_VEN,       NVIDIA_RTX3090TI_FE_SUB_DEV,                    NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 3090 Ti FE"               },
+    {NVIDIA_VEN,    NVIDIA_RTX3080_DEV,             NVIDIA_SUB_VEN,   NVIDIA_RTX3080_FE_SUB_DEV,                      NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 3080 FE"                  },
+    {NVIDIA_VEN,    NVIDIA_RTX3080TI_DEV,           NVIDIA_SUB_VEN,   NVIDIA_RTX3080TI_FE_SUB_DEV,                    NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 3080 Ti FE"               },
+    {NVIDIA_VEN,    NVIDIA_RTX3080TI_DEV,           NVIDIA_SUB_VEN,   MANLI_RTX3080TI_GALLARDO_SUB_DEV,               NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "MANLI GeForce RTX 3080 Ti GALLARDO"          },
+    {NVIDIA_VEN,    NVIDIA_RTX3090_DEV,             NVIDIA_SUB_VEN,   NVIDIA_RTX3090_FE_SUB_DEV,                      NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 3090 FE"                  },
+    {NVIDIA_VEN,    NVIDIA_RTX3090TI_DEV,           NVIDIA_SUB_VEN,   NVIDIA_RTX3090TI_FE_SUB_DEV,                    NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 3090 Ti FE"               },
     {NVIDIA_VEN,    NVIDIA_RTX4060_DEV,             PALIT_SUB_VEN,    PALIT_RTX4060_SUB_DEV,                          NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "Palit GeForce RTX 4060 Dual"                 },
     {NVIDIA_VEN,    NVIDIA_RTX4070_DEV,             PALIT_SUB_VEN,    PALIT_RTX4070_SUB_DEV,                          NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "Palit GeForce RTX 4070"                      },
     {NVIDIA_VEN,    NVIDIA_RTX4070S_DEV,            PALIT_SUB_VEN,    PALIT_RTX4070S_SUB_DEV,                         NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGB,     "Palit GeForce RTX 4070 SUPER Dual"           },
     {NVIDIA_VEN,    NVIDIA_RTX4070_DEV,             GAINWARD_SUB_VEN, GAINWARD_RTX_4070_GHOST_SUB_DEV,                NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "Gainward GeForce RTX 4070 Ghost"             },
-    {NVIDIA_VEN,    NVIDIA_RTX4080_DEV,             NVIDIA_VEN,       NVIDIA_RTX4080_FE_SUB_DEV,                      NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 4080 FE"                  },
-    {NVIDIA_VEN,    NVIDIA_RTX4080_DEV,             NVIDIA_VEN,       NVIDIA_RTX4080_FE_SUB_DEV2,                     NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 4080 FE"                  },
-    {NVIDIA_VEN,    NVIDIA_RTX4080S_DEV,            NVIDIA_VEN,       NVIDIA_RTX4080S_FE_SUB_DEV,                     NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 4080 SUPER FE"            },
-    {NVIDIA_VEN,    NVIDIA_RTX4090_DEV,             NVIDIA_VEN,       NVIDIA_RTX4090_FE_SUB_DEV,                      NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 4090 FE"                  },
-    {NVIDIA_VEN,    NVIDIA_RTX4090_DEV,             NVIDIA_VEN,       NVIDIA_RTX4090_FE_SUB_DEV2,                     NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 4090 FE"                  },
+    {NVIDIA_VEN,    NVIDIA_RTX4080_DEV,             NVIDIA_SUB_VEN,   NVIDIA_RTX4080_FE_SUB_DEV,                      NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 4080 FE"                  },
+    {NVIDIA_VEN,    NVIDIA_RTX4080_DEV,             NVIDIA_SUB_VEN,   NVIDIA_RTX4080_FE_SUB_DEV2,                     NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 4080 FE"                  },
+    {NVIDIA_VEN,    NVIDIA_RTX4080S_DEV,            NVIDIA_SUB_VEN,   NVIDIA_RTX4080S_FE_SUB_DEV,                     NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 4080 SUPER FE"            },
+    {NVIDIA_VEN,    NVIDIA_RTX4090_DEV,             NVIDIA_SUB_VEN,   NVIDIA_RTX4090_FE_SUB_DEV,                      NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 4090 FE"                  },
+    {NVIDIA_VEN,    NVIDIA_RTX4090_DEV,             NVIDIA_SUB_VEN,   NVIDIA_RTX4090_FE_SUB_DEV2,                     NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 4090 FE"                  },
+    {NVIDIA_VEN,    NVIDIA_RTX5080_DEV,             NVIDIA_SUB_VEN,   NVIDIA_RTX5080_FE_SUB_DEV,                      NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 5080 FE"                  },
+    {NVIDIA_VEN,    NVIDIA_RTX5090_DEV,             NVIDIA_SUB_VEN,   NVIDIA_RTX5090_FE_SUB_DEV,                      NVIDIA_ILLUMINATION_V1,     TREATS_RGBW_AS_RGBW,    "NVIDIA GeForce RTX 5090 FE"                  },
 };
 
 void DetectNVIDIAIllumGPUs()
@@ -105,7 +110,7 @@ void DetectNVIDIAIllumGPUs()
                    pci_subsystem_vendor == device_list[dev_idx].pci_subsystem_vendor &&
                    pci_subsystem_device == device_list[dev_idx].pci_subsystem_device)
                 {
-                    LOG_DEBUG("[%s] NVidia NvAPI Illumination GPU found", device_list[dev_idx].name);
+                    LOG_DEBUG("[%s] Nvidia NvAPI Illumination GPU found", device_list[dev_idx].name);
                     switch(device_list[dev_idx].gpu_rgb_version)
                     {
                         case NVIDIA_ILLUMINATION_V1:
@@ -125,4 +130,4 @@ void DetectNVIDIAIllumGPUs()
     }
 }
 
-REGISTER_DETECTOR("NVidia NvAPI Illumination", DetectNVIDIAIllumGPUs);
+REGISTER_DETECTOR("Nvidia NvAPI Illumination", DetectNVIDIAIllumGPUs);

Controllers/NZXTHue2Controller/NZXTHue2Controller.cpp

@@ -228,6 +228,14 @@ void NZXTHue2Controller::UpdateDeviceList()
                 num_leds_in_device = 8;
                 break;
 
+            case 0x1D: //F360 RGB Core Fan Case Version (360mm)
+                num_leds_in_device = 24;
+                break;
+
+            case 0x1E: //Kraken Elite Ring
+                num_leds_in_device = 24;
+                break;
+
             default:
                 break;
             }

Controllers/NZXTHue2Controller/NZXTHue2ControllerDetect.cpp

@@ -11,28 +11,32 @@
 
 #include <hidapi.h>
 #include "Detector.h"
+#include "LogManager.h"
 #include "NZXTHue2Controller.h"
 #include "RGBController_NZXTHue2.h"
 
-#define NZXT_VID                        0x1E71
-#define NZXT_HUE_2_PID                  0x2001
-#define NZXT_HUE_2_AMBIENT_PID          0x2002
-#define NZXT_MOTHERBOARD_DEVICE_PID     0x2005
-#define NZXT_MOTHERBOARD_DEVICE_2_PID   0x200B
-#define NZXT_SMART_DEVICE_V2_PID        0x2006
-#define NZXT_KRAKEN_X3_SERIES_PID       0x2007
-#define NZXT_KRAKEN_X3_SERIES_RGB_PID   0x2014
-#define NZXT_RGB_FAN_CONTROLLER_PID     0x2009
-#define NZXT_RGB_FAN_CONTROLLER2_PID    0x2010
-#define NZXT_RGB_FAN_CONTROLLER3_PID    0x200E
-#define NZXT_RGB_FAN_CONTROLLER4_PID    0x2011
-#define NZXT_RGB_FAN_CONTROLLER5_PID    0x2019
-#define NZXT_RGB_FAN_CONTROLLER6_PID    0x2020
-#define NZXT_RGB_FAN_CONTROLLER7_PID    0x201F
-#define NZXT_RGB_CONTROLLER_1_PID       0x2012
-#define NZXT_RGB_CONTROLLER_2_PID       0x2021
-#define NZXT_SMART_DEVICE_V2_1_PID      0x200D
-#define NZXT_SMART_DEVICE_V2_2_PID      0x200F
+#define NZXT_VID                                0x1E71
+#define NZXT_HUE_2_PID                          0x2001
+#define NZXT_HUE_2_AMBIENT_PID                  0x2002
+#define NZXT_MOTHERBOARD_DEVICE_PID             0x2005
+#define NZXT_MOTHERBOARD_DEVICE_2_PID           0x200B
+#define NZXT_SMART_DEVICE_V2_PID                0x2006
+#define NZXT_KRAKEN_X3_SERIES_PID               0x2007
+#define NZXT_KRAKEN_X3_SERIES_RGB_PID           0x2014
+#define NZXT_KRAKEN_2024_ELITE_SERIES_RGB_PID   0x3012
+#define NZXT_RGB_FAN_CONTROLLER_PID             0x2009
+#define NZXT_RGB_FAN_CONTROLLER2_PID            0x2010
+#define NZXT_RGB_FAN_CONTROLLER3_PID            0x200E
+#define NZXT_RGB_FAN_CONTROLLER4_PID            0x2011
+#define NZXT_RGB_FAN_CONTROLLER5_PID            0x2019
+#define NZXT_RGB_FAN_CONTROLLER6_PID            0x2020
+#define NZXT_RGB_FAN_CONTROLLER7_PID            0x201F
+#define NZXT_RGB_FAN_CONTROLLER8_PID            0x2022
+#define NZXT_RGB_FAN_CONTROLLER9_PID            0x201B
+#define NZXT_RGB_CONTROLLER_1_PID               0x2012
+#define NZXT_RGB_CONTROLLER_2_PID               0x2021
+#define NZXT_SMART_DEVICE_V2_1_PID              0x200D
+#define NZXT_SMART_DEVICE_V2_2_PID              0x200F
 
 static void spawn_hue(hid_device_info* info, const std::string& name, int rgb_channels, int fan_channels)
 {
@@ -45,6 +49,11 @@ static void spawn_hue(hid_device_info* info, const std::string& name, int rgb_ch
         rgb_controller->name                   = name;
 
         ResourceManager::get()->RegisterRGBController(rgb_controller);
+        LOG_TRACE("[NZXTHue2Controller] NZXT Controller setup: %s", info->path);
+    }
+    else 
+    {
+        LOG_DEBUG("[NZXTHue2Controller] Failed to load device: %s!", info->path);
     }
 }
 
@@ -73,6 +82,11 @@ void DetectNZXTKrakenX3(hid_device_info* info, const std::string& name)
     spawn_hue(info, name, 3, 0);
 }
 
+void DetectNZXTKrakenElite(hid_device_info* info, const std::string& name)
+{
+    spawn_hue(info, name, 2, 2);
+}
+
 void DetectNZXTFanController(hid_device_info* info, const std::string& name)
 {
     spawn_hue(info, name, 2, 3);
@@ -88,21 +102,24 @@ void DetectNZXTRGBController(hid_device_info* info, const std::string& name)
     spawn_hue(info, name, 3, 0);
 }
 
-REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController,         NZXT_VID, NZXT_RGB_FAN_CONTROLLER_PID);
-REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController,         NZXT_VID, NZXT_RGB_FAN_CONTROLLER2_PID);
-REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController,         NZXT_VID, NZXT_RGB_FAN_CONTROLLER3_PID);
-REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController6Channel, NZXT_VID, NZXT_RGB_FAN_CONTROLLER4_PID);
-REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController6Channel, NZXT_VID, NZXT_RGB_FAN_CONTROLLER5_PID);
-REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController6Channel, NZXT_VID, NZXT_RGB_FAN_CONTROLLER6_PID);
-REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController6Channel, NZXT_VID, NZXT_RGB_FAN_CONTROLLER7_PID);
-REGISTER_HID_DETECTOR("NZXT Hue 2",                DetectNZXTHue2,                  NZXT_VID, NZXT_HUE_2_PID);
-REGISTER_HID_DETECTOR("NZXT Hue 2 Ambient",        DetectNZXTHue2Ambient,           NZXT_VID, NZXT_HUE_2_AMBIENT_PID);
-REGISTER_HID_DETECTOR("NZXT Hue 2 Motherboard",    DetectNZXTHue2Motherboard,       NZXT_VID, NZXT_MOTHERBOARD_DEVICE_PID);
-REGISTER_HID_DETECTOR("NZXT Hue 2 Motherboard",    DetectNZXTHue2Motherboard,       NZXT_VID, NZXT_MOTHERBOARD_DEVICE_2_PID);
-REGISTER_HID_DETECTOR("NZXT Kraken X3 Series",     DetectNZXTKrakenX3,              NZXT_VID, NZXT_KRAKEN_X3_SERIES_PID);
-REGISTER_HID_DETECTOR("NZXT Kraken X3 Series RGB", DetectNZXTKrakenX3,              NZXT_VID, NZXT_KRAKEN_X3_SERIES_RGB_PID);
-REGISTER_HID_DETECTOR("NZXT RGB Controller",       DetectNZXTRGBController,         NZXT_VID, NZXT_RGB_CONTROLLER_1_PID);
-REGISTER_HID_DETECTOR("NZXT RGB Controller",       DetectNZXTRGBController,         NZXT_VID, NZXT_RGB_CONTROLLER_2_PID);
-REGISTER_HID_DETECTOR("NZXT Smart Device V2",      DetectNZXTSmartDeviceV2,         NZXT_VID, NZXT_SMART_DEVICE_V2_PID);
-REGISTER_HID_DETECTOR("NZXT Smart Device V2",      DetectNZXTSmartDeviceV2,         NZXT_VID, NZXT_SMART_DEVICE_V2_1_PID);
-REGISTER_HID_DETECTOR("NZXT Smart Device V2",      DetectNZXTSmartDeviceV2,         NZXT_VID, NZXT_SMART_DEVICE_V2_2_PID);
+REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller",          DetectNZXTFanController,         NZXT_VID, NZXT_RGB_FAN_CONTROLLER_PID);
+REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller",          DetectNZXTFanController,         NZXT_VID, NZXT_RGB_FAN_CONTROLLER2_PID);
+REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller",          DetectNZXTFanController,         NZXT_VID, NZXT_RGB_FAN_CONTROLLER3_PID);
+REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller",          DetectNZXTFanController6Channel, NZXT_VID, NZXT_RGB_FAN_CONTROLLER4_PID);
+REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller",          DetectNZXTFanController6Channel, NZXT_VID, NZXT_RGB_FAN_CONTROLLER5_PID);
+REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller",          DetectNZXTFanController6Channel, NZXT_VID, NZXT_RGB_FAN_CONTROLLER6_PID);
+REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller",          DetectNZXTFanController6Channel, NZXT_VID, NZXT_RGB_FAN_CONTROLLER7_PID);
+REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller 2024",     DetectNZXTFanController6Channel, NZXT_VID, NZXT_RGB_FAN_CONTROLLER8_PID);
+REGISTER_HID_DETECTOR("NZXT B650E Motherboard",             DetectNZXTFanController6Channel, NZXT_VID, NZXT_RGB_FAN_CONTROLLER9_PID);
+REGISTER_HID_DETECTOR("NZXT Hue 2",                         DetectNZXTHue2,                  NZXT_VID, NZXT_HUE_2_PID);
+REGISTER_HID_DETECTOR("NZXT Hue 2 Ambient",                 DetectNZXTHue2Ambient,           NZXT_VID, NZXT_HUE_2_AMBIENT_PID);
+REGISTER_HID_DETECTOR("NZXT Hue 2 Motherboard",             DetectNZXTHue2Motherboard,       NZXT_VID, NZXT_MOTHERBOARD_DEVICE_PID);
+REGISTER_HID_DETECTOR("NZXT Hue 2 Motherboard",             DetectNZXTHue2Motherboard,       NZXT_VID, NZXT_MOTHERBOARD_DEVICE_2_PID);
+REGISTER_HID_DETECTOR("NZXT Kraken X3 Series",              DetectNZXTKrakenX3,              NZXT_VID, NZXT_KRAKEN_X3_SERIES_PID);
+REGISTER_HID_DETECTOR("NZXT Kraken X3 Series RGB",          DetectNZXTKrakenX3,              NZXT_VID, NZXT_KRAKEN_X3_SERIES_RGB_PID);
+REGISTER_HID_DETECTOR("NZXT Kraken 2024 ELITE Series RGB",  DetectNZXTKrakenElite,           NZXT_VID, NZXT_KRAKEN_2024_ELITE_SERIES_RGB_PID);
+REGISTER_HID_DETECTOR("NZXT RGB Controller",                DetectNZXTRGBController,         NZXT_VID, NZXT_RGB_CONTROLLER_1_PID);
+REGISTER_HID_DETECTOR("NZXT RGB Controller",                DetectNZXTRGBController,         NZXT_VID, NZXT_RGB_CONTROLLER_2_PID);
+REGISTER_HID_DETECTOR("NZXT Smart Device V2",               DetectNZXTSmartDeviceV2,         NZXT_VID, NZXT_SMART_DEVICE_V2_PID);
+REGISTER_HID_DETECTOR("NZXT Smart Device V2",               DetectNZXTSmartDeviceV2,         NZXT_VID, NZXT_SMART_DEVICE_V2_1_PID);
+REGISTER_HID_DETECTOR("NZXT Smart Device V2",               DetectNZXTSmartDeviceV2,         NZXT_VID, NZXT_SMART_DEVICE_V2_2_PID);

Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp

@@ -332,6 +332,14 @@ void RGBController_NZXTHue2::SetupZones()
                 device_name = "F120 Core fan case version (120mm)";
                 break;
 
+            case 0x1D: //F360 Core fan case version (360mm)
+                device_name = "F360 Core fan case version (360mm)";
+                break;
+
+            case 0x1E: //Kraken Elite Ring
+                device_name = "Kraken Elite Ring";
+                break;
+
             default:
                 break;
             }
@@ -354,8 +362,19 @@ void RGBController_NZXTHue2::SetupZones()
     SetupColors();
 }
 
-void RGBController_NZXTHue2::ResizeZone(int /*zone*/, int /*new_size*/)
+void RGBController_NZXTHue2::ResizeZone(int zone, int new_size)
 {
+    if((size_t) zone >= zones.size())
+    {
+        return;
+    }
+
+    if(((unsigned int)new_size >= zones[zone].leds_min) && ((unsigned int)new_size <= zones[zone].leds_max))
+    {
+        zones[zone].leds_count = new_size;
+
+        SetupZones();
+    }
 
 }