Rework device enabling - fill in detectors list with detector names, default to true. Setting them to false disables the detectors

Add functions to set and save settings
Fix Profile list loading
2020-11-10 17:57:56 -06:00 · 2020-11-10 15:53:58 -06:00 · 2020-11-10 15:49:56 -06:00 · 2020-11-10 15:49:56 -06:00 · 2020-11-10 15:49:56 -06:00 · 2020-11-10 15:49:56 -06:00
439 changed files with 55499 additions and 7369 deletions
@@ -4,6 +4,10 @@
 # https://www.kittell.net/code/powershell-unix-sed-equivalent-change-text-file/
 # https://powershell.org/forums/topic/how-to-use-ansi-vt100-formatting-in-powershell-ooh-pretty-colors/

+#-----------------------------------------------------------------------#
+# OpenRGB GitLab CI Configuration                                       #
+#-----------------------------------------------------------------------#
+
 .shared_windows_runners:
  tags:
  - shared-windows
@@ -16,7 +20,26 @@ stages:
 before_script:
 - echo "started by ${GITLAB_USER_NAME}"

-build_linux:
+#-----------------------------------------------------------------------#
+# Linux (AppImage) 32-bit Build Target                                  #
+#-----------------------------------------------------------------------#
+build_linux_32:
+  image: i386/ubuntu:bionic
+  stage: build
+  script:
+  - apt update
+  - apt install -y build-essential qtcreator qt5-default libusb-1.0-0-dev libhidapi-dev pkgconf wget git
+  - ./scripts/build-appimage-32.sh
+  
+  artifacts:
+    paths:
+    - OpenRGB-i386.AppImage
+    expire_in: 30 days
+
+#-----------------------------------------------------------------------#
+# Linux (AppImage) 64-bit Build Target                                  #
+#-----------------------------------------------------------------------#
+build_linux_64:
  image: ubuntu:bionic
  stage: build
  script:
@@ -27,9 +50,84 @@ build_linux:
  artifacts:
    paths:
    - OpenRGB-x86_64.AppImage
-    expire_in: 1337 years
+    expire_in: 30 days
+  
+#-----------------------------------------------------------------------#
+# Windows (32-bit) Build Target                                         #
+#-----------------------------------------------------------------------#
+build_windows_32:
+  extends:
+  - .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"           ; }

-build_windows:
+
+  - _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://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_5150/qt.qt5.5150.win32_msvc2019/5.15.0-0-202005150700qtbase-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86.7z' 
+  - curl.exe -LJ -o qt-tools.7z 'https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_5150/qt.qt5.5150.win32_msvc2019/5.15.0-0-202005150700qttools-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86.7z'
+  - curl.exe -LJ -o qt-jom.zip  'https://download.qt.io/official_releases/jom/jom.zip'
+  - _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_ 'compressing the release folder so that we can upload it as artifact'
+  - mv release 'OpenRGB Windows 32-bit'
+  - ${datetime} = Get-Date ([datetime]::UtcNow) -Format "yyyy-MM-ddTHH-mm-ss"
+  - ${revision} = ((git rev-parse --short HEAD) | Out-String).Trim()
+  - ${rversion} = (((Get-Content '..\OpenRGB.pro' | Select-String -Pattern "VERSION     =") | Out-String).Trim().Split("="))[1].Trim()
+  - 7z a -mx9 -r -y "OpenRGB_${rversion}_32_${revision}_nightly_${datetime}.7z" 'OpenRGB Windows 32-bit'
+  - _fold_final_
+#  cache:
+#    key: same-key
+#    paths:
+#    - C:\vcpkg\installed\
+  artifacts:
+    paths:
+    - _build/*.7z
+    expire_in: 30 days
+
+#-----------------------------------------------------------------------#
+# Windows (64-bit) Build Target                                         #
+#-----------------------------------------------------------------------#
+build_windows_64:
  extends:
  - .shared_windows_runners
  stage: build
@@ -51,8 +149,8 @@ build_windows:
  - mkdir _qt
  - mkdir _qt_download
  - Push-Location _qt_download
-  - curl.exe -LJ -o qt-base.7z  'https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_5150/qt.qt5.5150.win64_msvc2017_64/5.15.0-0-202002260536qtbase-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z' 
-  - curl.exe -LJ -o qt-tools.7z 'https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_5150/qt.qt5.5150.win64_msvc2017_64/5.15.0-0-202002260536qttools-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z'
+  - curl.exe -LJ -o qt-base.7z  'https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_5150/qt.qt5.5150.win64_msvc2019_64/5.15.0-0-202005150700qtbase-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86_64.7z' 
+  - curl.exe -LJ -o qt-tools.7z 'https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_5150/qt.qt5.5150.win64_msvc2019_64/5.15.0-0-202005150700qttools-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86_64.7z'
  - curl.exe -LJ -o qt-jom.zip  'https://download.qt.io/official_releases/jom/jom.zip'
  - _fold_final_
  
@@ -63,7 +161,7 @@ build_windows:
  - _fold_final_
  
  - _fold_start_ 'turn the qt install from enterprise to foss; remove the licensing checks'
-  - ${qconfig-pri-folder} = '..\_qt\5.15.0\msvc2017_64\mkspecs\qconfig.pri'
+  - ${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
@@ -71,7 +169,7 @@ build_windows:
  
  - _fold_start_ 'run qmake and generate the msvc nmake makefile'
  - mkdir _build; cd _build
-  - ..\_qt\5.15.0\msvc2017_64\bin\qmake ..\OpenRGB.pro
+  - ..\_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'
@@ -79,7 +177,7 @@ build_windows:
  - _fold_final_
  
  - _fold_start_ 'run windeployqt to automatically copy the needed dll files'
-  - ..\_qt\5.15.0\msvc2017_64\bin\windeployqt --no-angle --no-translations --no-opengl-sw --no-system-d3d-compiler --no-compiler-runtime --no-webkit2 .\release\
+  - ..\_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_ 'compressing the release folder so that we can upload it as artifact'
@@ -96,4 +194,4 @@ build_windows:
  artifacts:
    paths:
    - _build/*.7z
-    expire_in: 1337 years
+    expire_in: 30 days
@@ -0,0 +1,14 @@
+<!-- 
+Found a bug?  Something isn't working as expected?  To help us keep track of the requests please start the title with [Bug Report]
+-->
+
+### Description of Bug
+<!--
+Please describe the bug.  Explain steps taken to reproduct the bug and what you expect the correct behavior to be.
+-->
+
+
+### Hardware Configuration
+<!--
+Please list the RGB hardware that you are using with OpenRGB.  If your bug does not relate to any one particular device or device type, or if the bug is in a part of the code not directly interacting with hardware, this is optional.
+-->
@@ -0,0 +1,9 @@
+<!-- 
+Have something you would like to see added to OpenRGB? Let us know here 
+To help us keep track of the requests please start the title with [Feature Request]
+-->
+
+### Feature Request
+<!--
+Please explain the new feature you would like to see added in detail.  Explain how you think it should work and provide any mock-ups, code snippets, etc. that you think will help explain the feature.
+-->
@@ -0,0 +1,46 @@
+<!-- 
+When naming the support request please title the request as 
+`[New Device] <Name of new device>` 
+Please open one issue per device you would lke to add
+-->
+
+### Name of device:
+<!--
+Please put the name of the product, including manufacturer, beneath this line
+-->
+
+
+### Link to manufacturer's product page:
+<!--
+Please link us to the manufacturer's product page beneath this line
+-->
+
+
+### Please select what type of device/interface the device uses:
+
+- [ ] Motherboard (SMBus)
+- [ ] Motherboard (USB)
+- [ ] RAM (SMBus)
+- [ ] GPU (I2C)
+- [ ] External USB (Peripheral, lighting controller, etc)
+- [ ] Internal USB (lighting controller, cooler, fan hub, etc)
+- [ ] I don't know (we can help you determine this)
+
+### ID information:
+<!--
+For PCI (GPU) devices we will need the Vendor ID, Device ID, Sub-Vendor ID and Sub-Device IDs
+In Windows this can be found under the device manager and on Linux this can be found wit lspci -vv
+For USB devices we will need the USB VID and PID
+-->
+
+
+### Please attach screenshots of the device's official control application here:
+<!--
+Screenshots of the official control software should show lists of supported modes, color selection, and zone/LED selection capabilities of the device's official software.
+-->
+
+
+### Please attach device captures here:
+<!--
+For information on how to capture device packets please see https://gitlab.com/Dr_No/OpenRGB/-/wikis/OpenRGB-doesn%27t-have-my-device
+-->
@@ -19,6 +19,11 @@ KERNEL=="hidraw*", SUBSYSTEM=="hidraw", TAG+="uaccess"
 #---------------------------------------------------------------#
 SUBSYSTEMS=="usb", ATTR{idVendor}=="2516", ATTR{idProduct}=="0051", TAG+="uaccess"

+#---------------------------------------------------------------#
+#  Aorus Devices                                                #
+#---------------------------------------------------------------#
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1044", ATTR{idProduct}=="7a42", TAG+="uaccess"
+
 #---------------------------------------------------------------#
 #  ASUS Aura Core Devices                                       #
 #---------------------------------------------------------------#
@@ -43,6 +48,17 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="0b05", ATTR{idProduct}=="18f3", TAG+="uacces
 #---------------------------------------------------------------#
 SUBSYSTEMS=="usb", ATTR{idVendor}=="2516", ATTR{idProduct}=="0109", TAG+="uaccess"

+#---------------------------------------------------------------#
+#  Corsair Hydro Series Devices                                 #
+#                                                               #
+#       Corsair H100i Pro RGB                                   #
+#       Corsair H115i Pro RGB                                   #
+#       Corsair H150i Pro RGB                                   #
+#---------------------------------------------------------------#
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1b1c", ATTR{idProduct}=="0c15", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1b1c", ATTR{idProduct}=="0c13", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1b1c", ATTR{idProduct}=="0c12", TAG+="uaccess"
+
 #---------------------------------------------------------------#
 #  Corsair Lighting Node Devices                                #
 #                                                               #
@@ -126,12 +142,78 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="0951", ATTR{idProduct}=="16be", TAG+="uacces
 #                                                               #
 #  Mice:                                                        #
 #       Logitech G203 Prodigy                                   #
+#       Logitech G203 Lightsync                                 #
 #       Logitech G403 Prodigy                                   #
 #       Logitech G403 Hero                                      #
+#       Logitech G502 Proteus Spectrum                          #
+#       Logitech G Lightspeed Wireless Gaming Mouse             #
+#       Logitech G Pro Wireless Gaming Mouse (Wired)            #
+#       Logitech G Powerplay Mousepad with Lightspeed           #
+#                                                               #
+#   Keyboards:                                                  #
+#       Logitech G512                                           #
+#       Logitech G512 RGB                                       #
+#       Logitech G810 #1                                        #
+#       Logitech G810 #2                                        #
 #---------------------------------------------------------------#
 SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c084", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c092", TAG+="uaccess"
 SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c083", TAG+="uaccess"
 SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c08f", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c332", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c539", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c088", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c53a", TAG+="uaccess"
+
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c342", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c33c", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c337", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c331", TAG+="uaccess"
+
+#---------------------------------------------------------------#
+#  MSI Mysticlight                                              #
+#---------------------------------------------------------------#
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="3EA4", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="4559", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7B10", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7B93", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7B94", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7B96", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C34", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C35", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C36", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C37", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C42", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C56", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C59", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C60", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C67", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C70", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C71", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C73", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C75", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C76", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C77", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C79", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C80", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C81", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C82", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C83", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C84", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C85", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C86", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C87", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C88", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C89", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C90", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C91", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C92", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C94", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C95", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C96", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C98", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C99", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="905D", TAG+="uaccess"

 #---------------------------------------------------------------#
 #  MSI/SteelSeries 3-Zone Laptop Keyboard                       #
@@ -177,6 +259,17 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="04d9", ATTR{idProduct}=="fc39", TAG+="uacces
 #  Gigabyte/Aorus RGB Fusion 2 USB                              #
 #---------------------------------------------------------------#
 SUBSYSTEMS=="usb", ATTR{idVendor}=="048d", ATTR{idProduct}=="8297", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="048d", ATTR{idProduct}=="5702", TAG+="uaccess"
+
+#---------------------------------------------------------------#
+#  Sinowealth USB                                               #
+#  Glorious Model O / O-                                        #
+#  Glorious Model D / D-                                        #
+#  Everest GT-100 RGB                                           #
+#---------------------------------------------------------------#
+SUBSYSTEMS=="usb", ATTR{idVendor}=="258a", ATTR{idProduct}=="0036", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="258a", ATTR{idProduct}=="0033", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="258a", ATTR{idProduct}=="0029", TAG+="uaccess"

 #---------------------------------------------------------------#
 #  SteelSeries Peripheral Devices                               #
@@ -12,9 +12,10 @@
 #include <stdio.h>
 #include <stdlib.h>

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

    strcpy(device_name, "AMD Wraith Prism");

@@ -38,6 +39,11 @@ AMDWraithPrismController::~AMDWraithPrismController()

 }

+std::string AMDWraithPrismController::GetLocationString()
+{
+    return(location);
+}
+
 char* AMDWraithPrismController::GetDeviceName()
 {
    return device_name;
@@ -49,6 +55,7 @@ std::string AMDWraithPrismController::GetEffectChannelString(unsigned char chann

    unsigned char usb_buf[] =
    {
+        0x00,
        0x40, 0x21, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00,
@@ -67,9 +74,9 @@ std::string AMDWraithPrismController::GetEffectChannelString(unsigned char chann
        0x00, 0x00, 0x00, 0x00,
    };

-    usb_buf[0x02] = channel;
+    usb_buf[0x03] = channel;

-    hid_write(dev, usb_buf, 64);
+    hid_write(dev, usb_buf, 65);
    hid_read(dev, usb_buf, 64);

    ret_string.append((char *)&usb_buf[0x08]);
@@ -83,6 +90,7 @@ std::string AMDWraithPrismController::GetFirmwareVersionString()

    unsigned char usb_buf[] =
    {
+        0x00,
        0x12, 0x20, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00,
@@ -103,7 +111,7 @@ std::string AMDWraithPrismController::GetFirmwareVersionString()

    unsigned char   fw_buf[16] = {0x00};

-    hid_write(dev, usb_buf, 64);
+    hid_write(dev, usb_buf, 65);
    hid_read(dev, usb_buf, 64);

    for(int char_idx = 0; char_idx < 16; char_idx+=2)
@@ -206,6 +214,7 @@ void AMDWraithPrismController::SendEnableCommand()
 {
    unsigned char usb_buf[] =
    {
+        0x00,
        0x41, 0x80, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00,
@@ -224,7 +233,7 @@ void AMDWraithPrismController::SendEnableCommand()
        0x00, 0x00, 0x00, 0x00,
    };

-    hid_write(dev, usb_buf, 64);
+    hid_write(dev, usb_buf, 65);
    hid_read(dev, usb_buf, 64);
 }

@@ -232,6 +241,7 @@ void AMDWraithPrismController::SendApplyCommand()
 {
    unsigned char usb_buf[] =
    {
+        0x00,
        0x51, 0x28, 0x00, 0x00,
        0xE0, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00,
@@ -250,7 +260,7 @@ void AMDWraithPrismController::SendApplyCommand()
        0x00, 0x00, 0x00, 0x00,
    };

-    hid_write(dev, usb_buf, 64);
+    hid_write(dev, usb_buf, 65);
    hid_read(dev, usb_buf, 64);
 }

@@ -269,6 +279,7 @@ void AMDWraithPrismController::SendEffectChannelUpdate
 {
    unsigned char usb_buf[] =
    {
+        0x00,
        0x51, 0x2C, 0x01, 0x00,
        0x05, 0xFF, 0x00, 0x01,
        0xFF, 0xFF, 0x00, 0xFF,
@@ -287,18 +298,18 @@ void AMDWraithPrismController::SendEffectChannelUpdate
        0xFF, 0xFF, 0xFF, 0xFF
    };

-    usb_buf[0x04]   = effect_channel;
-    usb_buf[0x05]   = speed;
-    usb_buf[0x06]   = (direction ? 0x01 : 0x00) | (random_color ? 0x80 : 0x00);
-    usb_buf[0x07]   = mode;
+    usb_buf[0x05]   = effect_channel;
+    usb_buf[0x06]   = speed;
+    usb_buf[0x07]   = (direction ? 0x01 : 0x00) | (random_color ? 0x80 : 0x00);
+    usb_buf[0x08]   = mode;

-    usb_buf[0x09]   = brightness;
+    usb_buf[0x0A]   = brightness;

-    usb_buf[0x0A]   = red;
-    usb_buf[0x0B]   = green;
-    usb_buf[0x0C]   = blue;
+    usb_buf[0x0B]   = red;
+    usb_buf[0x0C]   = green;
+    usb_buf[0x0D]   = blue;

-    hid_write(dev, usb_buf, 64);
+    hid_write(dev, usb_buf, 65);
    hid_read(dev, usb_buf, 64);
 }

@@ -306,6 +317,7 @@ void AMDWraithPrismController::SendChannelRemap(unsigned char ring_channel, unsi
 {
    unsigned char usb_buf[] =
    {
+        0x00,
        0x51, 0xA0, 0x01, 0x00,
        0x00, 0x03, 0x00, 0x00,
        0x05, 0x06, 0x07, 0x07,
@@ -324,14 +336,14 @@ void AMDWraithPrismController::SendChannelRemap(unsigned char ring_channel, unsi
        0x00, 0x00, 0x00, 0x00,
    };

-    usb_buf[0x08] = logo_channel;
-    usb_buf[0x09] = fan_channel;
+    usb_buf[0x09] = logo_channel;
+    usb_buf[0x0A] = fan_channel;

-    for(int led = 0x0A; led <= 0x18; led++)
+    for(int led = 0x0B; led <= 0x19; led++)
    {
        usb_buf[led] = ring_channel;
    }

-    hid_write(dev, usb_buf, 64);
+    hid_write(dev, usb_buf, 65);
    hid_read(dev, usb_buf, 64);
 }
@@ -109,13 +109,14 @@ enum
 class AMDWraithPrismController
 {
 public:
-    AMDWraithPrismController(hid_device* dev_handle);
+    AMDWraithPrismController(hid_device* dev_handle, const char* path);
    ~AMDWraithPrismController();

    char* GetDeviceName();

    std::string GetEffectChannelString(unsigned char channel);
    std::string GetFirmwareVersionString();
+    std::string GetLocationString();

    void SetRingEffectChannel(unsigned char channel);

@@ -131,6 +132,7 @@ public:
 private:
    char                    device_name[32];
    hid_device*             dev;
+    std::string             location;

    unsigned char           current_fan_mode;
    unsigned char           current_fan_speed;
@@ -1,3 +1,4 @@
+#include "Detector.h"
 #include "AMDWraithPrismController.h"
 #include "RGBController.h"
 #include "RGBController_AMDWraithPrism.h"
@@ -28,23 +29,26 @@ void DetectAMDWraithPrismControllers(std::vector<RGBController*>& rgb_controller
    {
        if((info->vendor_id == AMD_WRAITH_PRISM_VID)
         &&(info->product_id == AMD_WRAITH_PRISM_PID)
+#if USE_HID_USAGE
+         &&(info->interface_number == 1)
+         &&(info->usage_page == 0xFF00))
+#else
         &&(info->interface_number == 1))
+#endif
        {
            dev = hid_open_path(info->path);
-            break;
+        
+            if( dev )
+            {
+                AMDWraithPrismController* controller = new AMDWraithPrismController(dev, info->path);
+
+                RGBController_AMDWraithPrism* rgb_controller = new RGBController_AMDWraithPrism(controller);
+
+                rgb_controllers.push_back(rgb_controller);
+            }
        }
-        else
-        {
-            info = info->next;
-        }
-    }
-
-    if( dev )
-    {
-        AMDWraithPrismController* controller = new AMDWraithPrismController(dev);
-
-        RGBController_AMDWraithPrism* rgb_controller = new RGBController_AMDWraithPrism(controller);
-
-        rgb_controllers.push_back(rgb_controller);
+        info = info->next;
    }
 }
+
+REGISTER_DETECTOR("AMD Wraith Prism", DetectAMDWraithPrismControllers);
@@ -17,13 +17,14 @@ RGBController_AMDWraithPrism::RGBController_AMDWraithPrism(AMDWraithPrismControl
    type        = DEVICE_TYPE_COOLER;
    description = "AMD Wraith Prism Device";
    version     = wraith->GetFirmwareVersionString();
+    location    = wraith->GetLocationString();

-    mode Static;
-    Static.name       = "Static";
-    Static.value      = AMD_WRAITH_PRISM_EFFECT_CHANNEL_STATIC;
-    Static.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
-    Static.color_mode = MODE_COLORS_PER_LED;
-    modes.push_back(Static);
+    mode Direct;
+    Direct.name       = "Direct";
+    Direct.value      = AMD_WRAITH_PRISM_EFFECT_CHANNEL_STATIC;
+    Direct.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);

    mode Breathing;
    Breathing.name       = "Breathing";
@@ -199,7 +200,7 @@ void RGBController_AMDWraithPrism::SetCustomMode()
    active_mode = 0;
 }

-void RGBController_AMDWraithPrism::UpdateMode()
+void RGBController_AMDWraithPrism::DeviceUpdateMode()
 {
    bool random = (modes[active_mode].color_mode == MODE_COLORS_RANDOM);

@@ -26,7 +26,7 @@ public:
    void        UpdateSingleLED(int led);

    void        SetCustomMode();
-    void        UpdateMode();
+    void        DeviceUpdateMode();

 private:
    AMDWraithPrismController*   wraith;
@@ -0,0 +1,122 @@
+/*-----------------------------------------*\
+|  ATC800Controller.cpp                     |
+|                                           |
+|  Driver for Aorus ATC800 CPU Cooler       |
+|                                           |
+|                                           |
+|  Felipe Cavalcanti    08/13/2020          |
+\*-----------------------------------------*/
+
+#include "ATC800Controller.h"
+
+#include <cstring>
+
+ATC800Controller::ATC800Controller(hid_device* dev_handle, const char* path)
+{
+    dev         = dev_handle;
+    location    = path;
+}
+
+ATC800Controller::~ATC800Controller()
+{
+    hid_close(dev);
+}
+
+std::string ATC800Controller::GetDeviceLocation()
+{
+    return(location);
+}
+
+void ATC800Controller::SendCoolerMode
+    (
+    unsigned char       mode,
+    unsigned short      /*speed*/,
+    unsigned char       channel,
+    unsigned char       red,
+    unsigned char       green,
+    unsigned char       blue
+    )
+{
+    unsigned char usb_buf[9];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Lighting Control packet                        |
+    \*-----------------------------------------------------*/
+    if (channel == AORUS_ATC800_TOP_ZONE)
+    {
+        usb_buf[0x00] = 0x00;
+        usb_buf[0x01] = 0xbe;
+        usb_buf[0x08] = 0xcc;
+
+        hid_send_feature_report(dev, usb_buf, 9);
+        memset(usb_buf, 0x00, sizeof(usb_buf));
+
+        usb_buf[0x00] = 0x00;
+        usb_buf[0x01] = 0xc9;
+        usb_buf[0x02] = mode;
+        usb_buf[0x03] = 0x3c;
+        usb_buf[0x04] = 0x02;
+        usb_buf[0x05] = 0x00;
+        usb_buf[0x06] = 0x00;
+
+        hid_send_feature_report(dev, usb_buf, 9);
+        memset(usb_buf, 0x00, sizeof(usb_buf));
+
+        usb_buf[0x00] = 0x00;
+        usb_buf[0x01] = 0xbc;
+        usb_buf[0x02] = red;
+        usb_buf[0x03] = green;
+        usb_buf[0x04] = blue;
+
+        hid_send_feature_report(dev, usb_buf, 9);
+        memset(usb_buf, 0x00, sizeof(usb_buf));
+
+        usb_buf[0x00] = 0x00;
+        usb_buf[0x01] = 0xb6;
+    }
+    else if (channel == AORUS_ATC800_FANS_ZONE)
+    {
+        hid_send_feature_report(dev, usb_buf, 9);
+        memset(usb_buf, 0x00, sizeof(usb_buf));
+
+        usb_buf[0x00]           = 0x00;
+        usb_buf[0x01]           = 0xc9;
+        usb_buf[0x02]           = mode;
+        usb_buf[0x03]           = 0x3c;
+        usb_buf[0x04]           = 0x02;
+        usb_buf[0x05]           = 0x00;
+        usb_buf[0x06]           = 0x01;
+    
+        hid_send_feature_report(dev, usb_buf, 9);
+        memset(usb_buf, 0x00, sizeof(usb_buf));
+
+        usb_buf[0x00]           = 0x00;
+        usb_buf[0x01]           = 0xb0;
+        usb_buf[0x02]           = mode;
+        usb_buf[0x03]           = red;
+        usb_buf[0x04]           = green;
+        usb_buf[0x05]           = blue;
+
+        usb_buf[0x06]           = red;
+
+        usb_buf[0x07]           = green;
+        usb_buf[0x08]           = blue;
+
+        for(int i = 0xb0; i <= 0xb3; i++)
+        {
+            usb_buf[0x01]       = i; //zone b0->b3
+            hid_send_feature_report(dev, usb_buf, 9);
+        }
+    }
+
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+    usb_buf[0x00] = 0x00;
+    usb_buf[0x01] = 0xb6;
+
+    hid_send_feature_report(dev, usb_buf, 9);
+}
@@ -0,0 +1,62 @@
+/*-----------------------------------------*\
+|  ATC800Controller.h                       |
+|                                           |
+|  Definitions and types for ATC800 CPU     |
+|  Cooler                                   |
+|                                           |
+|  Felipe Cavalcanti     08/13/2020         |
+\*-----------------------------------------*/
+
+#include "RGBController.h"
+
+#include <string>
+#include <hidapi/hidapi.h>
+
+#pragma once
+
+enum
+{
+    AORUS_ATC800_MODE_OFF               = 0x00,
+    AORUS_ATC800_MODE_STATIC            = 0x01,
+    AORUS_ATC800_MODE_PULSE             = 0x02,
+    AORUS_ATC800_MODE_FLASHING          = 0x04,
+    AORUS_ATC800_MODE_DOUBLE_FLASH      = 0x05,
+};
+
+enum
+{
+    AORUS_ATC800_SPEED_SLOWEST          = 0x00, /* Slowest speed                */
+    AORUS_ATC800_SPEED_SLOW             = 0x01, /* Slow speed                   */
+    AORUS_ATC800_SPEED_NORMAL           = 0x02, /* Normal speed                 */
+    AORUS_ATC800_SPEED_FAST             = 0x03, /* Fast speed                   */
+    AORUS_ATC800_SPEED_FASTEST          = 0x04, /* Fastest speed                */
+};
+
+enum
+{
+    AORUS_ATC800_FANS_ZONE              = 0,
+    AORUS_ATC800_TOP_ZONE               = 1
+};
+
+class ATC800Controller
+{
+public:
+    ATC800Controller(hid_device* dev_handle, const char* path);
+    ~ATC800Controller();
+
+    std::string GetDeviceLocation();
+
+    void        SendCoolerMode
+                    (
+                    unsigned char       mode,
+                    unsigned short      speed,
+                    unsigned char       channel,
+                    unsigned char       red,
+                    unsigned char       green,
+                    unsigned char       blue
+                    );
+
+private:
+    hid_device*             dev;
+    std::string             location;
+};
@@ -0,0 +1,87 @@
+#include "Detector.h"
+#include "RGBController.h"
+#include "ATC800Controller.h"
+#include "RGBController_AorusATC800.h"
+#include <vector>
+#include <hidapi/hidapi.h>
+
+/*-----------------------------------------------------*\
+| Vendor ID                                             |
+\*-----------------------------------------------------*/
+#define HOLTEK_VID                            0x1044
+
+/*-----------------------------------------------------*\
+| Controller product ids                                |
+\*-----------------------------------------------------*/
+#define ATC_800_CONTROLLER_PID                0x7A42
+
+typedef struct
+{
+    unsigned short  usb_vid;
+    unsigned short  usb_pid;
+    char            usb_interface;
+    device_type     type;
+    const char *    name;
+} device;
+
+#define NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ]))
+
+static const device device_list[] =
+{
+    { HOLTEK_VID,             ATC_800_CONTROLLER_PID,                  0,  DEVICE_TYPE_KEYBOARD,   "Aorus ATC800 CPU Cooler"                             },
+};
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectAorusCPUCoolerControllers                                                        *
+*                                                                                          *
+*       Tests the USB address to see if a Aorus RGB CPU Cooler exists there.               *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectAorusCPUCoolerControllers(std::vector<RGBController*>& rgb_controllers)
+{
+    hid_init();
+
+    for(unsigned int device_idx = 0; device_idx < NUM_DEVICES; device_idx++)
+    {
+        hid_device_info* info = hid_enumerate(device_list[device_idx].usb_vid, device_list[device_idx].usb_pid);
+
+        while(info)
+        {
+            if((info->vendor_id == device_list[device_idx].usb_vid)
+            &&(info->product_id == device_list[device_idx].usb_pid)
+#ifdef USE_HID_USAGE                    
+            &&(info->interface_number == device_list[device_idx].usb_interface)
+            &&(info->usage_page == 0xFF01)
+            &&(info->usage == 1))
+#else
+            &&(info->interface_number == device_list[device_idx].usb_interface))
+#endif
+            {
+                hid_device* dev = hid_open_path(info->path);
+
+                if(dev)
+                {
+                    switch(device_list[device_idx].usb_pid)
+                    {
+                    case ATC_800_CONTROLLER_PID:
+                        {
+                            ATC800Controller* controller = new ATC800Controller(dev, info->path);
+
+                            RGBController_AorusATC800* rgb_controller = new RGBController_AorusATC800(controller);
+
+                            rgb_controller->name = device_list[device_idx].name;
+                            rgb_controllers.push_back(rgb_controller);
+                        }
+                        break;
+                    }
+                }
+            }
+        info = info->next;
+        }
+        hid_free_enumeration(info);
+    }
+}
+
+REGISTER_DETECTOR("Aorus CPU Coolers", DetectAorusCPUCoolerControllers);
@@ -0,0 +1,143 @@
+/*-----------------------------------------*\
+|  RGBController_AorusATC800.cpp            |
+|                                           |
+|  Generic RGB Interface Aorus ATC800 CPU   |
+|  Cooler                                   |
+|                                           |
+|  Felipe Cavalcanti 08/13/2020             |
+\*-----------------------------------------*/
+
+#include "RGBController_AorusATC800.h"
+
+RGBController_AorusATC800::RGBController_AorusATC800(ATC800Controller* cooler_ptr)
+{
+    cooler = cooler_ptr;
+
+    name        = "Aorus ATC800 CPU Cooler";
+    type        = DEVICE_TYPE_COOLER;
+    description = "Aorus ATC800 CPU Cooler";
+    location    = cooler->GetDeviceLocation();
+
+    mode Static;
+    Static.name       = "Static";
+    Static.value      = AORUS_ATC800_MODE_STATIC;
+    Static.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Static.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Static);
+
+    mode Off;
+    Off.name       = "Off";
+    Off.value      = AORUS_ATC800_MODE_OFF;
+    Off.flags      = 0;
+    Off.color_mode = MODE_COLORS_NONE;
+    modes.push_back(Off);
+
+    mode Flashing;
+    Flashing.name       = "Flashing";
+    Flashing.value      = AORUS_ATC800_MODE_FLASHING;
+    Flashing.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR;
+    Flashing.color_mode = MODE_COLORS_PER_LED;
+    Flashing.speed_min  = AORUS_ATC800_SPEED_SLOWEST;
+    Flashing.speed_max  = AORUS_ATC800_SPEED_FASTEST;
+    Flashing.speed      = AORUS_ATC800_SPEED_NORMAL;
+    modes.push_back(Flashing);
+
+    mode DoubleFlashing;
+    DoubleFlashing.name       = "Double Flashing";
+    DoubleFlashing.value      = AORUS_ATC800_MODE_DOUBLE_FLASH;
+    DoubleFlashing.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR;
+    DoubleFlashing.color_mode = MODE_COLORS_PER_LED;
+    DoubleFlashing.speed_min  = AORUS_ATC800_SPEED_SLOWEST;
+    DoubleFlashing.speed_max  = AORUS_ATC800_SPEED_FASTEST;
+    DoubleFlashing.speed      = AORUS_ATC800_SPEED_NORMAL;
+    modes.push_back(DoubleFlashing);
+
+    mode Pulsing;
+    Pulsing.name       = "Pulsing";
+    Pulsing.value      = AORUS_ATC800_MODE_PULSE;
+    Pulsing.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR;
+    Pulsing.color_mode = MODE_COLORS_PER_LED;
+    Pulsing.speed_min  = AORUS_ATC800_SPEED_SLOWEST;
+    Pulsing.speed_max  = AORUS_ATC800_SPEED_FASTEST;
+    Pulsing.speed      = AORUS_ATC800_SPEED_NORMAL;
+    modes.push_back(Pulsing);
+
+    SetupZones();
+}
+
+void RGBController_AorusATC800::SetupZones()
+{
+    zone atc800_cpu_fans_zone;
+    atc800_cpu_fans_zone.name           = "Fan";
+    atc800_cpu_fans_zone.type           = ZONE_TYPE_SINGLE;
+    atc800_cpu_fans_zone.leds_min       = 1;
+    atc800_cpu_fans_zone.leds_max       = 1;
+    atc800_cpu_fans_zone.leds_count     = 1;
+    atc800_cpu_fans_zone.matrix_map     = NULL;
+    zones.push_back(atc800_cpu_fans_zone);
+
+    led atc800_fan_led;
+    atc800_fan_led.name = "Fan";
+    leds.push_back(atc800_fan_led);
+
+    zone atc800_top_zone;
+    atc800_top_zone.name           = "Top";
+    atc800_top_zone.type           = ZONE_TYPE_SINGLE;
+    atc800_top_zone.leds_min       = 1;
+    atc800_top_zone.leds_max       = 1;
+    atc800_top_zone.leds_count     = 1;
+    atc800_top_zone.matrix_map     = NULL;
+    zones.push_back(atc800_top_zone);
+
+    led atc800_top_led;
+    atc800_top_led.name = "Top";
+    leds.push_back(atc800_top_led);
+
+    SetupColors();
+}
+
+void RGBController_AorusATC800::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_AorusATC800::DeviceUpdateLEDs()
+{
+    UpdateZoneLEDs(0);
+    UpdateZoneLEDs(1);
+}
+
+void RGBController_AorusATC800::UpdateZoneLEDs(int zone)
+{
+    unsigned char mode = modes[active_mode].value;
+    unsigned char red  = RGBGetRValue(colors[zone]);
+    unsigned char grn  = RGBGetGValue(colors[zone]);
+    unsigned char blu  = RGBGetBValue(colors[zone]);
+
+    if (mode == AORUS_ATC800_MODE_OFF)
+    {
+        mode = 1;
+        red  = 0;
+        grn  = 0;
+        blu  = 0;
+    }
+
+    cooler->SendCoolerMode(mode, modes[active_mode].speed, zone, red, grn, blu);
+}
+
+void RGBController_AorusATC800::UpdateSingleLED(int led)
+{
+    UpdateZoneLEDs(led);
+}
+
+void RGBController_AorusATC800::SetCustomMode()
+{
+
+}
+
+void RGBController_AorusATC800::DeviceUpdateMode()
+{
+    DeviceUpdateLEDs();
+}
@@ -0,0 +1,32 @@
+/*-----------------------------------------*\
+|  RGBController_AorusATC800.h              |
+|                                           |
+|  Generic RGB Interface for Aorus ATC 800  |
+|  CPU Cooler                               |
+|                                           |
+|  Felipe Cavalcanti 08/13/2020             |
+\*-----------------------------------------*/
+
+#pragma once
+#include "RGBController.h"
+#include "ATC800Controller.h"
+
+class RGBController_AorusATC800 : public RGBController
+{
+public:
+    RGBController_AorusATC800(ATC800Controller* logitech_ptr);
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        SetCustomMode();
+    void        DeviceUpdateMode();
+
+private:
+    ATC800Controller*   cooler;
+};
@@ -1,3 +1,4 @@
+#include "Detector.h"
 #include "AuraCoreController.h"
 #include "RGBController.h"
 #include "RGBController_AuraCore.h"
@@ -43,3 +44,5 @@ void DetectAuraCoreControllers(std::vector<RGBController*>& rgb_controllers)
        }
    }
 }
+
+REGISTER_DETECTOR("ASUS Aura Core", DetectAuraCoreControllers);
@@ -51,7 +51,7 @@ void RGBController_AuraCore::SetupZones()
    Keyboard.matrix_map = NULL;
    zones.push_back(Keyboard);

-    for(int led_idx = 0; led_idx < Keyboard.leds_count; led_idx++)
+    for(unsigned int led_idx = 0; led_idx < Keyboard.leds_count; led_idx++)
    {
        led KeyLED;
        KeyLED.name = "Keyboard LED ";
@@ -76,7 +76,7 @@ void RGBController_AuraCore::DeviceUpdateLEDs()

 void RGBController_AuraCore::UpdateZoneLEDs(int /*zone*/)
 {
-    for(int led_idx = 0; led_idx < leds.size(); led_idx++)
+    for(unsigned int led_idx = 0; led_idx < leds.size(); led_idx++)
    {
        UpdateSingleLED(led_idx);
    }
@@ -102,7 +102,7 @@ void RGBController_AuraCore::SetCustomMode()
    active_mode = 0;
 }

-void RGBController_AuraCore::UpdateMode()
+void RGBController_AuraCore::DeviceUpdateMode()
 {
    DeviceUpdateLEDs();
 }
@@ -25,7 +25,7 @@ public:
    void        UpdateSingleLED(int led);

    void        SetCustomMode();
-    void        UpdateMode();
+    void        DeviceUpdateMode();

 private:
    AuraCoreController* aura;
@@ -6,6 +6,7 @@
 |  Jan Rettig (Klapstuhl) 14.02.2020        |
 \*-----------------------------------------*/

+#include "Detector.h"
 #include "AuraGPUController.h"
 #include "RGBController.h"
 #include "RGBController_AuraGPU.h"
@@ -82,4 +83,6 @@ void DetectAuraGPUControllers(std::vector<i2c_smbus_interface*> &busses, std::ve
            std::this_thread::sleep_for(1ms);
        }
    }
-} /* DetectAuraGPUControllers() */
+} /* DetectAuraGPUControllers() */
+
+REGISTER_I2C_DETECTOR("ASUS Aura GPU", DetectAuraGPUControllers);
@@ -173,7 +173,7 @@ void RGBController_AuraGPU::SetCustomMode()
    active_mode = 0;
 }

-void RGBController_AuraGPU::UpdateMode()
+void RGBController_AuraGPU::DeviceUpdateMode()
 {
    int new_mode = modes[active_mode].value;
    aura_gpu->direct = false;
@@ -25,7 +25,7 @@ public:
    void        UpdateSingleLED(int led);

    void        SetCustomMode();
-    void        UpdateMode();
+    void        DeviceUpdateMode();

 private:
    AuraGPUController* aura_gpu;
@@ -10,6 +10,21 @@
 #include "AuraSMBusController.h"
 #include <cstring>

+static const char* aura_channels[] =                /* Aura channel strings                 */
+{
+    "Audio",
+    "Backplate",
+    "Back I/O",
+    "Center",
+    "Center",
+    "DRAM",
+    "PCIe",
+    "RGB Header",
+    "RGB Header 2",
+    "RGB Header",
+    "Unknown",
+};
+
 AuraSMBusController::AuraSMBusController(i2c_smbus_interface* bus, aura_dev_id dev)
 {
    this->bus = bus;
@@ -45,7 +60,7 @@ AuraSMBusController::AuraSMBusController(i2c_smbus_interface* bus, aura_dev_id d
    {
        direct_reg  = AURA_REG_COLORS_DIRECT_V2;
        effect_reg  = AURA_REG_COLORS_EFFECT_V2;
-        channel_cfg = AURA_CONFIG_CHANNEL_V2;
+        channel_cfg = AURA_CONFIG_CHANNEL_V1;
    }
    // AUMA0-E6K5-0106 - Second generation motherboard controller
    else if (strcmp(device_name, "AUMA0-E6K5-0106") == 0)
@@ -68,6 +83,13 @@ AuraSMBusController::AuraSMBusController(i2c_smbus_interface* bus, aura_dev_id d
        effect_reg = AURA_REG_COLORS_EFFECT_V2;
        channel_cfg = AURA_CONFIG_CHANNEL_V2;
    }
+    // AUMA0-E8K4-0101 - Second generation motherboard controller
+    else if (strcmp(device_name, "AUMA0-E8K4-0101") == 0)
+    {
+        direct_reg = AURA_REG_COLORS_DIRECT_V2;
+        effect_reg = AURA_REG_COLORS_EFFECT_V2;
+        channel_cfg = AURA_CONFIG_CHANNEL_V2;
+    }
    // Assume first generation controller if string does not match
    else
    {
@@ -94,7 +116,7 @@ std::string AuraSMBusController::GetDeviceLocation()
    snprintf(addr, 5, "0x%02X", dev);
    return_string.append(", address ");
    return_string.append(addr);
-    return(return_string);
+    return("I2C: " + return_string);
 }

 unsigned char AuraSMBusController::GetChannel(unsigned int led)
@@ -66,21 +66,6 @@ enum
    AURA_LED_CHANNEL_RGB_HEADER_3       = 0x91,     /* RGB Header 3 LED channel             */
 };

-static const char* aura_channels[] =                /* Aura channel strings                 */
-{
-    "Audio",
-    "Backplate",
-    "Back I/O",
-    "Center",
-    "Center",
-    "DRAM",
-    "PCIe",
-    "RGB Header",
-    "RGB Header 2",
-    "RGB Header",
-    "Unknown",
-};
-
 enum
 {
    AURA_CONFIG_LED_COUNT               = 0x02,     /* LED Count configuration offset       */
@@ -1,7 +1,9 @@
+#include "Detector.h"
 #include "AuraSMBusController.h"
 #include "RGBController.h"
 #include "RGBController_AuraSMBus.h"
 #include "i2c_smbus.h"
+#include "pci_ids.h"
 #include <vector>
 #include <stdio.h>
 #include <stdlib.h>
@@ -11,7 +13,7 @@ using namespace std::chrono_literals;
 /*----------------------------------------------------------------------*\
 | This list contains the available SMBus addresses for mapping Aura RAM  |
 \*----------------------------------------------------------------------*/
-#define AURA_RAM_ADDRESS_COUNT  22
+#define AURA_RAM_ADDRESS_COUNT  23

 static const unsigned char aura_ram_addresses[] =
 {
@@ -34,6 +36,7 @@ static const unsigned char aura_ram_addresses[] =
    0x66,
    0x67,
    0x39,
+    0x3A,
    0x3B,
    0x3C,
    0x3D
@@ -128,62 +131,70 @@ void DetectAuraSMBusControllers(std::vector<i2c_smbus_interface*> &busses, std::
    {
        int address_list_idx = -1;

-        // Remap Aura-enabled RAM modules on 0x77
-        for (unsigned int slot = 0; slot < 8; slot++)
+        IF_DRAM_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device)
        {
-            int res = busses[bus]->i2c_smbus_write_quick(0x77, I2C_SMBUS_WRITE);
-
-            if (res < 0)
+            // Remap Aura-enabled RAM modules on 0x77
+            for (unsigned int slot = 0; slot < 8; slot++)
            {
-                break;
-            }
+                int res = busses[bus]->i2c_smbus_write_quick(0x77, I2C_SMBUS_WRITE);

-            do
-            {
-                address_list_idx++;
-
-                if(address_list_idx < AURA_RAM_ADDRESS_COUNT)
-                {
-                    res = busses[bus]->i2c_smbus_write_quick(aura_ram_addresses[address_list_idx], I2C_SMBUS_WRITE);
-                }
-                else
+                if (res < 0)
                {
                    break;
                }
-            } while (res >= 0);

-            if(address_list_idx < AURA_RAM_ADDRESS_COUNT)
-            {
-                AuraRegisterWrite(busses[bus], 0x77, AURA_REG_SLOT_INDEX, slot);
-                AuraRegisterWrite(busses[bus], 0x77, AURA_REG_I2C_ADDRESS, (aura_ram_addresses[address_list_idx] << 1));
-            }
-        }
+                do
+                {
+                    address_list_idx++;

-        // Add Aura-enabled controllers at their remapped addresses
-        for (unsigned int address_list_idx = 0; address_list_idx < AURA_RAM_ADDRESS_COUNT; address_list_idx++)
-        {
-            if (TestForAuraSMBusController(busses[bus], aura_ram_addresses[address_list_idx]))
-            {
-                new_aura = new AuraSMBusController(busses[bus], aura_ram_addresses[address_list_idx]);
-                new_controller = new RGBController_AuraSMBus(new_aura);
-                rgb_controllers.push_back(new_controller);
+                    if(address_list_idx < AURA_RAM_ADDRESS_COUNT)
+                    {
+                        res = busses[bus]->i2c_smbus_write_quick(aura_ram_addresses[address_list_idx], I2C_SMBUS_WRITE);
+                    }
+                    else
+                    {
+                        break;
+                    }
+                } while (res >= 0);
+
+                if(address_list_idx < AURA_RAM_ADDRESS_COUNT)
+                {
+                    AuraRegisterWrite(busses[bus], 0x77, AURA_REG_SLOT_INDEX, slot);
+                    AuraRegisterWrite(busses[bus], 0x77, AURA_REG_I2C_ADDRESS, (aura_ram_addresses[address_list_idx] << 1));
+                }
            }

-            std::this_thread::sleep_for(1ms);
+            // Add Aura-enabled controllers at their remapped addresses
+            for (unsigned int address_list_idx = 0; address_list_idx < AURA_RAM_ADDRESS_COUNT; address_list_idx++)
+            {
+                if (TestForAuraSMBusController(busses[bus], aura_ram_addresses[address_list_idx]))
+                {
+                    new_aura = new AuraSMBusController(busses[bus], aura_ram_addresses[address_list_idx]);
+                    new_controller = new RGBController_AuraSMBus(new_aura);
+                    rgb_controllers.push_back(new_controller);
+                }
+
+                std::this_thread::sleep_for(1ms);
+            }
        }

        // Add Aura-enabled motherboard controllers
-        for (unsigned int address_list_idx = 0; address_list_idx < AURA_MOBO_ADDRESS_COUNT; address_list_idx++)
+        IF_MOBO_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device)
        {
-            if (TestForAuraSMBusController(busses[bus], aura_mobo_addresses[address_list_idx]))
+            for (unsigned int address_list_idx = 0; address_list_idx < AURA_MOBO_ADDRESS_COUNT; address_list_idx++)
            {
-                new_aura = new AuraSMBusController(busses[bus], aura_mobo_addresses[address_list_idx]);
-                new_controller = new RGBController_AuraSMBus(new_aura);
-                rgb_controllers.push_back(new_controller);
-            }
+                if (TestForAuraSMBusController(busses[bus], aura_mobo_addresses[address_list_idx]))
+                {
+                    new_aura = new AuraSMBusController(busses[bus], aura_mobo_addresses[address_list_idx]);
+                    new_controller = new RGBController_AuraSMBus(new_aura);
+                    rgb_controllers.push_back(new_controller);
+                }

-            std::this_thread::sleep_for(1ms);
+                std::this_thread::sleep_for(1ms);
+            }
        }
    }

 }   /* DetectAuraSMBusControllers() */
+
+REGISTER_I2C_DETECTOR("ASUS Aura SMBus", DetectAuraSMBusControllers);
@@ -207,6 +207,11 @@ RGBController_AuraSMBus::RGBController_AuraSMBus(AuraSMBusController * aura_ptr)
    active_mode = GetDeviceMode();
 }

+RGBController_AuraSMBus::~RGBController_AuraSMBus()
+{
+    delete aura;
+}
+
 void RGBController_AuraSMBus::SetupZones()
 {
    std::vector<int>    aura_led_map;
@@ -330,7 +335,7 @@ void RGBController_AuraSMBus::SetCustomMode()
    active_mode = 0;
 }

-void RGBController_AuraSMBus::UpdateMode()
+void RGBController_AuraSMBus::DeviceUpdateMode()
 {
    if (modes[active_mode].value == 0xFFFF)
    {
@@ -16,6 +16,7 @@ class RGBController_AuraSMBus : public RGBController
 {
 public:
    RGBController_AuraSMBus(AuraSMBusController* aura_ptr);
+    ~RGBController_AuraSMBus();

    void        SetupZones();

@@ -26,7 +27,7 @@ public:
    void        UpdateSingleLED(int led);

    void        SetCustomMode();
-    void        UpdateMode();
+    void        DeviceUpdateMode();

 private:
    AuraSMBusController* aura;
@@ -10,7 +10,7 @@
 #include "AuraAddressableController.h"
 #include <cstring>

-AuraAddressableController::AuraAddressableController(hid_device* dev_handle) : AuraUSBController(dev_handle)
+AuraAddressableController::AuraAddressableController(hid_device* dev_handle, const char* path) : AuraUSBController(dev_handle, path)
 {
    /*-----------------------------------------------------*\
    | Add addressable devices                               |
@@ -40,7 +40,7 @@ void AuraAddressableController::SetChannelLEDs(unsigned char channel, RGBColor *
            leds_to_send = num_colors - leds_sent;
        }

-        for(int led_idx = 0; led_idx < leds_to_send; led_idx++)
+        for(unsigned int led_idx = 0; led_idx < leds_to_send; led_idx++)
        {
            led_data[(led_idx * 3) + 0] = RGBGetRValue(colors[led_idx + leds_sent]);
            led_data[(led_idx * 3) + 1] = RGBGetGValue(colors[led_idx + leds_sent]);
@@ -23,7 +23,7 @@ enum
 class AuraAddressableController : public AuraUSBController
 {
 public:
-    AuraAddressableController(hid_device* dev_handle);
+    AuraAddressableController(hid_device* dev_handle, const char* path);
    ~AuraAddressableController();

    void SetChannelLEDs
@@ -10,7 +10,7 @@
 #include "AuraMainboardController.h"
 #include <cstring>

-AuraMainboardController::AuraMainboardController(hid_device* dev_handle) : AuraUSBController(dev_handle), mode(AURA_MODE_DIRECT)
+AuraMainboardController::AuraMainboardController(hid_device* dev_handle, const char* path) : AuraUSBController(dev_handle, path), mode(AURA_MODE_DIRECT)
 {
    /*-----------------------------------------------------*\
    | Add mainboard device                                  |
@@ -44,7 +44,7 @@ void AuraMainboardController::SetChannelLEDs(unsigned char channel, RGBColor * c
            leds_to_send = num_colors - leds_sent;
        }

-        for(int led_idx = 0; led_idx < leds_to_send; led_idx++)
+        for(unsigned int led_idx = 0; led_idx < leds_to_send; led_idx++)
        {
            led_data[(led_idx * 3) + 0] = RGBGetRValue(colors[led_idx + leds_sent]);
            led_data[(led_idx * 3) + 1] = RGBGetGValue(colors[led_idx + leds_sent]);
@@ -25,7 +25,7 @@ enum
 class AuraMainboardController : public AuraUSBController
 {
 public:
-    AuraMainboardController(hid_device* dev_handle);
+    AuraMainboardController(hid_device* dev_handle, const char* path);
    ~AuraMainboardController();

    void SetChannelLEDs
@@ -0,0 +1,64 @@
+/*-----------------------------------------*\
+|  AuraMouseController.cpp                  |
+|                                           |
+|  Driver for ASUS Aura RGB USB             |
+|  lighting controller                      |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 10/23/2020  |
+\*-----------------------------------------*/
+
+#include "AuraMouseController.h"
+
+#include <cstring>
+
+AuraMouseController::AuraMouseController(hid_device* dev_handle, const char* path)
+{
+    dev         = dev_handle;
+    location    = path;
+}
+
+AuraMouseController::~AuraMouseController()
+{
+
+}
+
+std::string AuraMouseController::GetDeviceLocation()
+{
+    return(location);
+}
+
+void AuraMouseController::SendUpdate
+    (
+    unsigned char   zone,
+    unsigned char   mode,
+    unsigned char   red,
+    unsigned char   grn,
+    unsigned char   blu
+    )
+{
+    unsigned char usb_buf[65];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up message packet                                 |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]   = 0x00;
+    usb_buf[0x01]   = 0x51;
+    usb_buf[0x02]   = 0x28;
+    usb_buf[0x03]   = zone;
+    usb_buf[0x04]   = 0x00;
+    usb_buf[0x05]   = mode;
+    usb_buf[0x06]   = 0x04;
+    usb_buf[0x07]   = red;
+    usb_buf[0x08]   = grn;
+    usb_buf[0x09]   = blu;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_write(dev, usb_buf, 65);
+}
@@ -0,0 +1,54 @@
+/*-----------------------------------------*\
+|  AuraMouseController.h                    |
+|                                           |
+|  Definitions and types for ASUS Aura      |
+|  USB RGB lighting controller              |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 10/23/2020  |
+\*-----------------------------------------*/
+
+#include "RGBController.h"
+
+#include <string>
+#include <vector>
+#include <hidapi/hidapi.h>
+
+#pragma once
+
+enum
+{
+    AURA_MOUSE_ZONE_LOGO        = 0,
+    AURA_MOUSE_ZONE_SCROLL      = 1,
+    AURA_MOUSE_ZONE_UNDERGLOW   = 2,
+    AURA_MOUSE_ZONE_ALL         = 3,
+};
+
+enum
+{
+    AURA_MOUSE_MODE_STATIC      = 0,
+    AURA_MOUSE_MODE_BREATHING   = 1,
+    AURA_MOUSE_MODE_COLOR_CYCLE = 2,
+    AURA_MOUSE_MODE_REACTIVE    = 3,
+};
+
+class AuraMouseController
+{
+public:
+    AuraMouseController(hid_device* dev_handle, const char* path);
+    virtual ~AuraMouseController();
+
+    std::string GetDeviceLocation();
+
+    void SendUpdate
+        (
+        unsigned char   zone,
+        unsigned char   mode,
+        unsigned char   red,
+        unsigned char   grn,
+        unsigned char   blu
+        );
+
+private:
+    hid_device*                 dev;
+    std::string                 location;
+};
@@ -11,9 +11,10 @@
 #include <cstring>
 #include <stdexcept>

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

    GetFirmwareVersion();
    GetConfigTable();
@@ -29,6 +30,11 @@ unsigned int AuraUSBController::GetChannelCount()
    return(device_info.size());
 }

+std::string AuraUSBController::GetDeviceLocation()
+{
+    return(location);
+}
+
 std::string AuraUSBController::GetDeviceName()
 {
    return(device_name);
@@ -59,11 +59,12 @@ struct AuraDeviceInfo
 class AuraUSBController
 {
 public:
-    AuraUSBController(hid_device* dev_handle);
+    AuraUSBController(hid_device* dev_handle, const char* path);
    virtual ~AuraUSBController();

    unsigned int GetChannelCount();

+    std::string GetDeviceLocation();
    std::string GetDeviceName();

    const std::vector<AuraDeviceInfo>& GetAuraDevices() const;
@@ -88,6 +89,7 @@ protected:
    hid_device*                 dev;
    unsigned char               config_table[60];
    std::vector<AuraDeviceInfo> device_info;
+    std::string                 location;

    void SendDirect
        (
@@ -1,77 +1,170 @@
+#include "Detector.h"
 #include "AuraAddressableController.h"
 #include "AuraMainboardController.h"
+#include "AuraMouseController.h"
 #include "RGBController.h"
 #include "RGBController_AuraUSB.h"
+#include "RGBController_AuraMouse.h"
 #include <vector>
 #include <stdexcept>
 #include <hidapi/hidapi.h>

-#define AURA_USB_VID 0x0B05
+#define AURA_USB_VID                            0x0B05
+#define AURA_TERMINAL_PID                       0x1889
+#define AURA_ADDRESSABLE_1_PID                  0x1867
+#define AURA_ADDRESSABLE_2_PID                  0x1872
+#define AURA_ADDRESSABLE_3_PID                  0x18A3
+#define AURA_ADDRESSABLE_4_PID                  0x18A5
+#define AURA_MOTHERBOARD_1_PID                  0x18F3
+#define AURA_MOTHERBOARD_2_PID                  0x1939
+#define AURA_ROG_GLADIUS_II_CORE_PID            0x18DD
+#define AURA_ROG_GLADIUS_II_PID                 0x1845
+#define AURA_ROG_GLADIUS_II_ORIGIN_PID          0x1877

-#define NUM_ADDRESSABLE_PIDS 4
-static const unsigned short addressable_pid_table[] =
-    {
-    0x1867,
-    0x1872,
-    0x1889,
-    0x18A3
-    };
+typedef struct
+{
+    unsigned short  usb_vid;
+    unsigned short  usb_pid;
+    unsigned short  usb_interface;
+    const char *    name;
+} aura_device;

-#define NUM_MAINBOARD_PIDS 2
-static const unsigned short mainboard_pid_table[] =
-    {
-    0x18f3,
-    0x1939
-    };
+#define ADDRESSABLE_NUM_DEVICES (sizeof(addressable_device_list) / sizeof(addressable_device_list[ 0 ]))

-/******************************************************************************************\
-*                                                                                          *
-*   DetectAuraUSBControllers                                                               *
-*                                                                                          *
-*       Tests the USB address to see if an Asus Aura USB RGB header controller             *
-*       exists there.                                                                      *
-*                                                                                          *
-\******************************************************************************************/
+static const aura_device addressable_device_list[] =
+{
+/*---------------------------------------------------------------------------------*\
+| ASUS AURA Addressable                                                             |
+\*---------------------------------------------------------------------------------*/
+    { AURA_USB_VID,     AURA_TERMINAL_PID,          0,  "ASUS ROG AURA Terminal"    },
+    { AURA_USB_VID,     AURA_ADDRESSABLE_1_PID,     0,  "ASUS Aura Addressable"     },
+    { AURA_USB_VID,     AURA_ADDRESSABLE_2_PID,     0,  "ASUS Aura Addressable"     },
+    { AURA_USB_VID,     AURA_ADDRESSABLE_3_PID,     0,  "ASUS Aura Addressable"     },
+    { AURA_USB_VID,     AURA_ADDRESSABLE_4_PID,     0,  "ASUS Aura Addressable"     },
+};
+
+#define MOTHERBOARD_NUM_DEVICES (sizeof(motherboard_device_list) / sizeof(motherboard_device_list[ 0 ]))
+
+static const aura_device motherboard_device_list[] =
+{
+/*---------------------------------------------------------------------------------*\
+| ASUS AURA Motherboard                                                             |
+\*---------------------------------------------------------------------------------*/
+    { AURA_USB_VID,     AURA_MOTHERBOARD_1_PID,     0,  "ASUS Aura Motherboard"     },
+    { AURA_USB_VID,     AURA_MOTHERBOARD_2_PID,     0,  "ASUS Aura Motherboard"     },
+};
+
+#define MOUSE_NUM_DEVICES (sizeof(mouse_device_list) / sizeof(mouse_device_list[ 0 ]))
+
+static const aura_device mouse_device_list[] =
+{
+    { AURA_USB_VID,     AURA_ROG_GLADIUS_II_CORE_PID,   0,  "ASUS ROG Gladius II Core"      },
+    { AURA_USB_VID,     AURA_ROG_GLADIUS_II_PID,        2,  "ASUS ROG Gladius II"           },
+    { AURA_USB_VID,     AURA_ROG_GLADIUS_II_ORIGIN_PID, 2,  "ASUS ROG Gladius II Origin"    },
+};

 void DetectAuraUSBControllers(std::vector<RGBController*>& rgb_controllers)
 {
-    hid_device* dev;
+    hid_device_info* info = NULL;

-    //Look for Asus Aura addressable RGB header controller
    hid_init();

-    for(int pid_idx = 0; pid_idx < NUM_ADDRESSABLE_PIDS; pid_idx++)
+    /*ASUS AURA Addressable*/
+    for(unsigned int pid_idx = 0; pid_idx < ADDRESSABLE_NUM_DEVICES; pid_idx++)
    {
-        dev = hid_open(AURA_USB_VID, addressable_pid_table[pid_idx], 0);
+        info = hid_enumerate(addressable_device_list[pid_idx].usb_vid, addressable_device_list[pid_idx].usb_pid);

-        if( dev )
+        while(info)
        {
-            AuraAddressableController* controller = new AuraAddressableController(dev);
+            hid_device* dev = NULL;

-            RGBController_AuraUSB* rgb_controller = new RGBController_AuraUSB(controller);
+            if((info->vendor_id  == addressable_device_list[pid_idx].usb_vid)
+             &&(info->product_id == addressable_device_list[pid_idx].usb_pid))
+            {
+                dev = hid_open_path(info->path);

-            rgb_controllers.push_back(rgb_controller);
+                if(dev)
+                {
+                    AuraAddressableController* controller = new AuraAddressableController(dev, info->path);
+                    RGBController_AuraUSB* rgb_controller = new RGBController_AuraUSB(controller);
+                    rgb_controller->name = addressable_device_list[pid_idx].name;
+                    rgb_controllers.push_back(rgb_controller);
+                }
+            }
+
+            info = info->next;
        }
    }

-    for(int pid_idx = 0; pid_idx < NUM_MAINBOARD_PIDS; pid_idx++)
+    info = NULL;
+
+    /*ASUS AURA Motherboard*/
+    for(unsigned int pid_idx = 0; pid_idx < MOTHERBOARD_NUM_DEVICES; pid_idx++)
    {
-        dev = hid_open(AURA_USB_VID, mainboard_pid_table[pid_idx], 0);
+        info = hid_enumerate(motherboard_device_list[pid_idx].usb_vid, motherboard_device_list[pid_idx].usb_pid);

-        if( dev )
+        while(info)
        {
-            try
-            {
-                AuraMainboardController* controller = new AuraMainboardController(dev);
+            hid_device* dev = NULL;

-                RGBController_AuraUSB* rgb_controller = new RGBController_AuraUSB(controller);
-
-                rgb_controllers.push_back(rgb_controller);
-            }
-            catch(std::runtime_error&)
+            if((info->vendor_id  == motherboard_device_list[pid_idx].usb_vid)
+             &&(info->product_id == motherboard_device_list[pid_idx].usb_pid))
            {
-                // reading the config table failed
+                dev = hid_open_path(info->path);
+
+                if(dev)
+                {
+                    try
+                    {
+                        AuraMainboardController* controller = new AuraMainboardController(dev, info->path);
+                        RGBController_AuraUSB* rgb_controller = new RGBController_AuraUSB(controller);
+                        rgb_controller->name = motherboard_device_list[pid_idx].name;
+                        rgb_controllers.push_back(rgb_controller);
+                    }
+                    catch(std::runtime_error&)
+                    {
+                        // reading the config table failed
+                    }
+                }
            }
+
+            info = info->next;
        }
    }
-}
+
+    /*ASUS AURA Mouse*/
+    for(unsigned int pid_idx = 0; pid_idx < MOUSE_NUM_DEVICES; pid_idx++)
+    {
+        info = hid_enumerate(mouse_device_list[pid_idx].usb_vid, mouse_device_list[pid_idx].usb_pid);
+
+        while(info)
+        {
+            hid_device* dev = NULL;
+
+            if((info->vendor_id  == mouse_device_list[pid_idx].usb_vid)
+             &&(info->product_id == mouse_device_list[pid_idx].usb_pid)
+#ifdef USE_HID_USAGE
+             &&(info->interface_number == mouse_device_list[pid_idx].usb_interface )
+             &&(info->usage_page == 0xFF01))
+#else
+             &&(info->interface_number == mouse_device_list[pid_idx].usb_interface ))
+#endif
+            {
+                dev = hid_open_path(info->path);
+
+                if(dev)
+                {
+                    AuraMouseController* controller = new AuraMouseController(dev, info->path);
+                    RGBController_AuraMouse* rgb_controller = new RGBController_AuraMouse(controller);
+                    rgb_controller->name = mouse_device_list[pid_idx].name;
+                    rgb_controllers.push_back(rgb_controller);
+                }
+            }
+
+            info = info->next;
+        }
+    }
+
+}  /* DetectAuraUSBControllers() */
+
+REGISTER_DETECTOR("ASUS Aura USB", DetectAuraUSBControllers);
@@ -0,0 +1,202 @@
+/*-----------------------------------------*\
+|  RGBController_AuraMouse.cpp              |
+|                                           |
+|  Generic RGB Interface for Asus Aura      |
+|  USB controller driver                    |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 10/25/2020  |
+\*-----------------------------------------*/
+
+#include "RGBController_AuraMouse.h"
+
+RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* aura_ptr)
+{
+    aura = aura_ptr;
+
+    name        = "ASUS Aura Mouse";
+    type        = DEVICE_TYPE_MOUSE;
+    description = "ASUS Aura Mouse Device";
+    location    = aura->GetDeviceLocation();
+
+    mode Direct;
+    Direct.name       = "Direct";
+    Direct.value      = AURA_MOUSE_MODE_STATIC;
+    Direct.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
+    mode Breathing;
+    Breathing.name       = "Breathing";
+    Breathing.value      = AURA_MOUSE_MODE_BREATHING;
+    Breathing.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Breathing.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Breathing);
+
+    mode SpectrumCycle;
+    SpectrumCycle.name       = "Spectrum Cycle";
+    SpectrumCycle.value      = AURA_MOUSE_MODE_COLOR_CYCLE;
+    SpectrumCycle.flags      = 0;
+    SpectrumCycle.color_mode = MODE_COLORS_NONE;
+    modes.push_back(SpectrumCycle);
+
+    mode Reactive;
+    Reactive.name       = "Reactive";
+    Reactive.value      = AURA_MOUSE_MODE_REACTIVE;
+    Reactive.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Reactive.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Reactive);
+
+    SetupZones();
+}
+
+RGBController_AuraMouse::~RGBController_AuraMouse()
+{
+
+}
+
+void RGBController_AuraMouse::SetupZones()
+{
+    zone logo_zone;
+
+    logo_zone.name          = "Logo";
+    logo_zone.type          = ZONE_TYPE_SINGLE;
+    logo_zone.leds_min      = 1;
+    logo_zone.leds_max      = 1;
+    logo_zone.leds_count    = 1;
+    logo_zone.matrix_map    = NULL;
+
+    zones.push_back(logo_zone);
+
+    led logo_led;
+
+    logo_led.name           = "Logo";
+
+    leds.push_back(logo_led);
+
+    zone scroll_zone;
+
+    scroll_zone.name        = "Scroll Wheel";
+    scroll_zone.type        = ZONE_TYPE_SINGLE;
+    scroll_zone.leds_min    = 1;
+    scroll_zone.leds_max    = 1;
+    scroll_zone.leds_count  = 1;
+    scroll_zone.matrix_map  = NULL;
+
+    zones.push_back(scroll_zone);
+
+    led scroll_led;
+
+    scroll_led.name         = "Scroll Wheel";
+
+    leds.push_back(scroll_led);
+
+    zone underglow_zone;
+
+    underglow_zone.name       = "Underglow";
+    underglow_zone.type       = ZONE_TYPE_SINGLE;
+    underglow_zone.leds_min   = 1;
+    underglow_zone.leds_max   = 1;
+    underglow_zone.leds_count = 1;
+    underglow_zone.matrix_map = NULL;
+
+    zones.push_back(underglow_zone);
+
+    led underglow_led;
+
+    underglow_led.name        = "Underglow";
+
+    leds.push_back(underglow_led);
+
+    SetupColors();
+}
+
+void RGBController_AuraMouse::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+
+}
+
+void RGBController_AuraMouse::DeviceUpdateLEDs()
+{
+    DeviceUpdateMode();
+}
+
+void RGBController_AuraMouse::UpdateZoneLEDs(int zone)
+{
+    UpdateSingleLED(zone);
+}
+
+void RGBController_AuraMouse::UpdateSingleLED(int led)
+{
+    unsigned char red = 0;
+    unsigned char grn = 0;
+    unsigned char blu = 0;
+
+    if(modes[active_mode].color_mode == MODE_COLORS_PER_LED)
+    {
+        if(led == 0)
+        {
+            red = RGBGetRValue(colors[led]);
+            grn = RGBGetGValue(colors[led]);
+            blu = RGBGetBValue(colors[led]);
+
+            aura->SendUpdate(AURA_MOUSE_ZONE_LOGO, modes[active_mode].value, red, grn, blu);
+        }
+        else if(led == 1)
+        {
+            red = RGBGetRValue(colors[led]);
+            grn = RGBGetGValue(colors[led]);
+            blu = RGBGetBValue(colors[led]);
+
+            aura->SendUpdate(AURA_MOUSE_ZONE_SCROLL, modes[active_mode].value, red, grn, blu);
+        }
+        else
+        {
+            red = RGBGetRValue(colors[led]);
+            grn = RGBGetGValue(colors[led]);
+            blu = RGBGetBValue(colors[led]);
+
+            aura->SendUpdate(AURA_MOUSE_ZONE_UNDERGLOW, modes[active_mode].value, red, grn, blu);
+        }
+    }
+    else
+    {
+        aura->SendUpdate(AURA_MOUSE_ZONE_ALL, modes[active_mode].value, red, grn, blu);
+    }
+}
+
+void RGBController_AuraMouse::SetCustomMode()
+{
+    active_mode = 0;
+}
+
+void RGBController_AuraMouse::DeviceUpdateMode()
+{
+    unsigned char red = 0;
+    unsigned char grn = 0;
+    unsigned char blu = 0;
+
+    if(modes[active_mode].color_mode == MODE_COLORS_PER_LED)
+    {
+        red = RGBGetRValue(colors[0]);
+        grn = RGBGetGValue(colors[0]);
+        blu = RGBGetBValue(colors[0]);
+
+        aura->SendUpdate(AURA_MOUSE_ZONE_LOGO, modes[active_mode].value, red, grn, blu);
+
+        red = RGBGetRValue(colors[1]);
+        grn = RGBGetGValue(colors[1]);
+        blu = RGBGetBValue(colors[1]);
+
+        aura->SendUpdate(AURA_MOUSE_ZONE_SCROLL, modes[active_mode].value, red, grn, blu);
+
+        red = RGBGetRValue(colors[2]);
+        grn = RGBGetGValue(colors[2]);
+        blu = RGBGetBValue(colors[2]);
+
+        aura->SendUpdate(AURA_MOUSE_ZONE_UNDERGLOW, modes[active_mode].value, red, grn, blu);
+    }
+    else
+    {
+        aura->SendUpdate(AURA_MOUSE_ZONE_ALL, modes[active_mode].value, red, grn, blu);
+    }
+}
@@ -0,0 +1,33 @@
+/*-----------------------------------------*\
+|  RGBController_AuraMouse.h                |
+|                                           |
+|  Generic RGB Interface for Asus Aura      |
+|  USB controller driver                    |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 10/25/2020  |
+\*-----------------------------------------*/
+
+#pragma once
+#include "RGBController.h"
+#include "AuraMouseController.h"
+
+class RGBController_AuraMouse : public RGBController
+{
+public:
+    RGBController_AuraMouse(AuraMouseController* aura_ptr);
+    ~RGBController_AuraMouse();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        SetCustomMode();
+    void        DeviceUpdateMode();
+
+private:
+    AuraMouseController*  aura;
+};
@@ -17,6 +17,7 @@ RGBController_AuraUSB::RGBController_AuraUSB(AuraUSBController* aura_ptr)
    version     = aura->GetDeviceName();
    type        = DEVICE_TYPE_MOTHERBOARD;
    description = "ASUS Aura USB Device";
+    location    = aura->GetDeviceLocation();

    mode Direct;
    Direct.name       = "Direct";
@@ -175,6 +176,11 @@ void RGBController_AuraUSB::SetupZones()

 void RGBController_AuraUSB::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;
@@ -208,7 +214,7 @@ void RGBController_AuraUSB::SetCustomMode()

 }

-void RGBController_AuraUSB::UpdateMode()
+void RGBController_AuraUSB::DeviceUpdateMode()
 {
    unsigned char red = 0;
    unsigned char grn = 0;
@@ -28,7 +28,7 @@ public:
    void        UpdateSingleLED(int led);

    void        SetCustomMode();
-    void        UpdateMode();
+    void        DeviceUpdateMode();

 private:
    AuraUSBController*  aura;
@@ -0,0 +1,283 @@
+/*-------------------------------------------------------------------*\
+|  CMARGBController.cpp                                               |
+|                                                                     |
+|  Driver for Coolermaster ARGB USB Controller                        |
+|                                                                     |
+|  Chris M (Dr_No)          10th Oct 2020                             |
+|                                                                     |
+\*-------------------------------------------------------------------*/
+
+#include "CMARGBcontroller.h"
+#include <cstring>
+
+static unsigned char argb_colour_index_data[2][2][2] =
+{     //B0    B1
+    { { 0x00, 0x03 },    //G0 R0
+      { 0x02, 0x06 }, }, //G1 R0
+    { { 0x01, 0x05 }, 	 //G0 R1
+      { 0x04, 0x07 }, }  //G1 R1
+};
+
+static unsigned char argb_mode_data[2][9] =
+{
+    { 0x05, 0x01, 0x02, 0x03, 0x04, 0x01, 0x01, 0x01, 0x01 },    //12v RGB Mode values
+    { 0x0A, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x08, 0x09 }     //5v ARGB Mode values
+};
+
+CMARGBController::CMARGBController(hid_device* dev_handle, char *_path, unsigned char _zone_idx)
+{
+    const int szTemp = 256;
+    wchar_t tmpName[szTemp];
+
+    dev                     = dev_handle;
+    location                = _path;
+    zone_index              = _zone_idx;
+    current_speed           = CM_ARGB_SPEED_NORMAL;
+
+    hid_get_manufacturer_string(dev, tmpName, szTemp);
+    std::wstring wName = std::wstring(tmpName);
+    device_name = std::string(wName.begin(), wName.end());
+
+    hid_get_product_string(dev, tmpName, szTemp);
+    wName = std::wstring(tmpName);
+    device_name.append(" ").append(std::string(wName.begin(), wName.end()));
+
+    hid_get_serial_number_string(dev, tmpName, szTemp);
+    wName = std::wstring(tmpName);
+    serial = std::string(wName.begin(), wName.end());
+
+    GetStatus();
+}
+
+CMARGBController::~CMARGBController()
+{
+    hid_close(dev);
+}
+
+void CMARGBController::GetStatus()
+{
+    unsigned char buffer[0x40]          = { 0x00 };
+    int buffer_size                     = (sizeof(buffer) / sizeof(buffer[0]));
+    int header                          = zone_index - 1;
+
+    /*buffer[CM_ARGB_REPORT_BYTE]         = 0x80;
+    buffer[CM_ARGB_COMMAND_BYTE]        = 0x01;
+    buffer[CM_ARGB_FUNCTION_BYTE]       = 0x01;
+    hid_write(dev, buffer, buffer_size);
+
+    buffer[CM_ARGB_COMMAND_BYTE]        = 0x0b;
+    buffer[CM_ARGB_FUNCTION_BYTE]       = 0x03;
+    buffer[CM_ARGB_ZONE_BYTE]           = 0xFF;
+    hid_write(dev, buffer, buffer_size);
+
+    int i = 0;
+    do{
+        hid_read_timeout(dev, buffer, buffer_size, CM_ARGB_INTERRUPT_TIMEOUT);
+        i++;
+    }while( (i < 4) );
+
+    current_mode                        = argb_mode_data[1][buffer[4]];
+    current_speed                       = buffer[5];*/
+}
+
+std::string CMARGBController::GetDeviceName()
+{
+    return device_name;
+}
+
+std::string CMARGBController::GetSerial()
+{
+    return serial;
+}
+
+std::string CMARGBController::GetLocation()
+{
+    return location;
+}
+
+unsigned char CMARGBController::GetZoneIndex()
+{
+    return zone_index;
+}
+
+unsigned char CMARGBController::GetMode()
+{
+    return current_mode;
+}
+
+unsigned char CMARGBController::GetLedRed()
+{
+    return current_red;
+}
+
+unsigned char CMARGBController::GetLedGreen()
+{
+    return current_green;
+}
+
+unsigned char CMARGBController::GetLedBlue()
+{
+    return current_blue;
+}
+
+unsigned char CMARGBController::GetLedSpeed()
+{
+    return current_speed;
+}
+
+unsigned int CMARGBController::GetLargestColour(unsigned int red, unsigned int green, unsigned int blue)
+{
+    unsigned int largest;
+    if ( red > green )
+    {
+        ( red > blue ) ? largest = red : largest = blue;
+    }
+    else
+    {
+        ( green > blue ) ? largest = green : largest = blue;
+    }
+
+    return (largest == 0) ? 1 : largest;
+}
+
+unsigned char CMARGBController::GetColourIndex(unsigned char red, unsigned char green, unsigned char blue)
+{
+    //The Coolermaster ARGB controller uses a limited colour pallette referenced by an index
+    //Starting at 0x00 Random, 0x01 Red, 0x02 Green, 0x03 Blue, 0x04 Yellow, 0x05 Purple, 0x06 Cyan, 0x07 White
+    //The index can be calculated by normalising the input colour, rounding those values 
+    //and using them as the indicies of a 3d array containing the correct index
+    unsigned int divisor    = GetLargestColour( red, green, blue);
+    unsigned int r          = round( red / divisor );
+    unsigned int g          = round( green / divisor );
+    unsigned int b          = round( blue / divisor );
+    unsigned char idx       = argb_colour_index_data[r][g][b];
+    return idx;
+}
+
+void CMARGBController::SetMode(unsigned char mode, unsigned char speed)
+{
+    current_mode  = mode;
+    current_speed = speed;
+
+    SendUpdate();
+}
+
+void CMARGBController::SetColor(unsigned char red, unsigned char green, unsigned char blue)
+{
+    current_red   = red;
+    current_green = green;
+    current_blue  = blue;
+
+    SendUpdate();
+}
+
+void CMARGBController::SetLedsDirect(RGBColor *led_colours, unsigned int led_count)
+{
+    const unsigned char buffer_size     = 0x41;
+    unsigned char buffer[buffer_size]   = { 0x00 };
+    unsigned char packet_count          = 0x00;
+    std::vector<unsigned char> colours;
+
+    //Set up the RGB triplets to send
+    for(int i = 0; i < led_count; i++)
+    {
+        RGBColor      colour            = led_colours[i];
+        unsigned char r                 = RGBGetRValue(colour);
+        unsigned char g                 = RGBGetGValue(colour);
+        unsigned char b                 = RGBGetBValue(colour);
+
+        colours.push_back(r);
+        colours.push_back(g);
+        colours.push_back(b);
+    }
+
+    //buffer[CM_ARGB_REPORT_BYTE]         = packet_count;
+    buffer[CM_ARGB_COMMAND_BYTE]        = 0x10;
+    buffer[CM_ARGB_FUNCTION_BYTE]       = 0x02;
+    buffer[CM_ARGB_ZONE_BYTE]           = argb_header_data[zone_index].header;
+    buffer[CM_ARGB_MODE_BYTE]           = 0x30; //30 might be the LED count??
+    unsigned char buffer_idx            = CM_ARGB_MODE_BYTE + 1;    //Start colour info from
+
+    for (std::vector<unsigned char>::iterator it = colours.begin(); it != colours.end(); buffer_idx = 0)
+    {
+        //Fill the write buffer till its full or the colour buffer is empty
+        buffer[CM_ARGB_REPORT_BYTE] = packet_count;
+        while (( buffer_idx < buffer_size) && ( it != colours.end() ))
+        {
+            buffer[buffer_idx] = *it;
+            buffer_idx++;
+            it++;
+        }
+
+        hid_write(dev, buffer, buffer_size);
+        hid_read_timeout(dev, buffer, buffer_size, CM_ARGB_INTERRUPT_TIMEOUT);
+
+        //reset the write buffer
+        memset(buffer, 0x00, sizeof(buffer) );
+        packet_count++;
+    }
+    buffer[CM_ARGB_REPORT_BYTE]         = 0x82;
+    buffer[CM_ARGB_COMMAND_BYTE]        = 0x62;
+    buffer[CM_ARGB_FUNCTION_BYTE]       = 0x00;
+    buffer[CM_ARGB_ZONE_BYTE]           = 0x73;
+    buffer[CM_ARGB_MODE_BYTE]           = 0x00;
+    buffer[CM_ARGB_COLOUR_INDEX_BYTE]   = 0x33;
+    buffer[CM_ARGB_SPEED_BYTE]          = 0x1B;
+
+    hid_write(dev, buffer, buffer_size);
+    hid_read_timeout(dev, buffer, buffer_size, CM_ARGB_INTERRUPT_TIMEOUT);
+}
+
+void CMARGBController::SendUpdate()
+{
+    unsigned char buffer[0x40]          = { 0x00 };
+    int  buffer_size                    = (sizeof(buffer) / sizeof(buffer[0]));
+    bool boolARGB_header                = argb_header_data[zone_index].digital;
+    bool boolPassthru                   = ( current_mode == CM_ARGB_MODE_PASSTHRU );
+    bool boolDirect                     = ( current_mode == CM_ARGB_MODE_DIRECT );
+    unsigned char function              = boolPassthru ? 0x02 : ( boolARGB_header ? 0x03 : 0x01);
+    buffer[CM_ARGB_REPORT_BYTE]         = 0x80;
+    buffer[CM_ARGB_COMMAND_BYTE]        = boolDirect ? 0x10 : 0x01;
+    buffer[CM_ARGB_FUNCTION_BYTE]       = boolDirect ? 0x01 : function;
+
+    if ( boolDirect )
+    {
+        buffer[CM_ARGB_COMMAND_BYTE]        = 0x10;
+        buffer[CM_ARGB_FUNCTION_BYTE]       = 0x01;
+        buffer[CM_ARGB_ZONE_BYTE]           = argb_header_data[zone_index].header;
+        buffer[CM_ARGB_MODE_BYTE]           = 0x30; //30 might be the LED count??
+
+        //hid_write(dev, buffer, buffer_size);
+        //hid_read_timeout(dev, buffer, buffer_size, CM_ARGB_INTERRUPT_TIMEOUT);
+    }
+    else
+    {
+        buffer[CM_ARGB_COMMAND_BYTE]        = 0x01;
+        buffer[CM_ARGB_FUNCTION_BYTE]       = function;
+    }
+    hid_write(dev, buffer, buffer_size);
+
+
+    if ( boolARGB_header )
+    {
+        buffer[CM_ARGB_COMMAND_BYTE]        = 0x0b; //ARGB sends 0x0b (1011) RGB sends 0x04 (0100)
+        buffer[CM_ARGB_FUNCTION_BYTE]       = (false) ? 0x01 : 0x02; //This controls custom mode TODO
+        buffer[CM_ARGB_ZONE_BYTE]           = argb_header_data[zone_index].header;
+        buffer[CM_ARGB_MODE_BYTE]           = argb_mode_data[1][current_mode];
+        buffer[CM_ARGB_COLOUR_INDEX_BYTE]   = GetColourIndex( current_red, current_green, current_blue );
+        buffer[CM_ARGB_SPEED_BYTE]          = current_speed;
+
+        hid_write(dev, buffer, buffer_size);
+        hid_read_timeout(dev, buffer, buffer_size, CM_ARGB_INTERRUPT_TIMEOUT);
+    }
+    else
+    {
+        buffer[CM_ARGB_COMMAND_BYTE]                        = 0x04; //ARGB sends 0x0b (1011) RGB sends 0x04 (0100)
+        buffer[CM_ARGB_MODE_BYTE + CM_RGB_OFFSET]           = argb_mode_data[0][current_mode];
+        buffer[CM_ARGB_COLOUR_INDEX_BYTE + CM_RGB_OFFSET]   = GetColourIndex( current_red, current_green, current_blue );
+        buffer[CM_ARGB_SPEED_BYTE + CM_RGB_OFFSET]          = current_speed;
+
+        hid_write(dev, buffer, buffer_size);
+        hid_read_timeout(dev, buffer, buffer_size, CM_ARGB_INTERRUPT_TIMEOUT);
+    }
+}
@@ -0,0 +1,127 @@
+/*-------------------------------------------------------------------*\
+|  CMARGBController.h                                                 |
+|                                                                     |
+|  Driver for Coolermaster ARGB USB Controller                        |
+|                                                                     |
+|  Chris M (Dr_No)          10th Oct 2020                             |
+|                                                                     |
+|  Simple RGB device with 5 modes                                     |
+|                                                                     |
+\*-------------------------------------------------------------------*/
+
+#include <string>
+#include <array>
+#include <cmath>            //Needed by round()
+#include <hidapi/hidapi.h>
+#include "RGBController.h"  //Needed to set the direct mode
+
+#pragma once
+
+#define CM_ARGB_COLOUR_MODE_DATA_SIZE (sizeof(colour_mode_data[0]) / sizeof(colour_mode_data[0][0]))
+#define CM_ARGB_HEADER_DATA_SIZE (sizeof(argb_header_data) / sizeof(argb_headers) )
+#define CM_ARGB_INTERRUPT_TIMEOUT 250
+#define CM_ARGB_DEVICE_NAME_SIZE (sizeof(device_name) / sizeof(device_name[ 0 ]))
+#define CM_RGB_OFFSET -2
+#define HID_MAX_STR 255
+
+enum
+{
+    CM_ARGB_REPORT_BYTE         = 1,
+    CM_ARGB_COMMAND_BYTE        = 2,
+    CM_ARGB_FUNCTION_BYTE       = 3,
+    CM_ARGB_ZONE_BYTE           = 4,
+    CM_ARGB_MODE_BYTE           = 5,
+    CM_ARGB_COLOUR_INDEX_BYTE	= 6,
+    CM_ARGB_SPEED_BYTE          = 7
+};
+
+struct argb_headers
+{
+    const char*     name;
+    unsigned char   header;
+    bool            digital;
+    unsigned int    count;
+};
+
+static argb_headers argb_header_data[6] =
+{
+    { "RGB Header",         0xFF, false,  1 },
+    { "Digital ARGB1",      0x01, true,  12 },
+    { "Digital ARGB2",      0x02, true,  12 },
+    { "Digital ARGB3",      0x04, true,  12 },
+    { "Digital ARGB4",      0x08, true,  12 },
+    { "All Digital ARGB",   0xFF, true,  12 }
+};
+
+enum
+{
+    CM_RGB_MODE_OFF             = 0,    //Turn off
+    CM_RGB_MODE_COLOUR_CYCLE    = 1,    //Colour Cycle
+    CM_RGB_MODE_FLASH           = 2,    //Flash
+    CM_RGB_MODE_BREATHING       = 3,    //Breathing
+    CM_RGB_MODE_PASSTHRU        = 4     //Motherboard Pass Thru Mode
+};
+
+enum
+{
+    CM_ARGB_MODE_OFF            = 0,    //Turn off
+    CM_ARGB_MODE_SPECTRUM       = 1,    //Spectrum Mode
+    CM_ARGB_MODE_RELOAD         = 2,    //Reload Mode
+    CM_ARGB_MODE_RECOIL         = 3,    //Recoil Mode
+    CM_ARGB_MODE_BREATHING      = 4,    //Breathing Mode
+    CM_ARGB_MODE_REFILL         = 5,    //Refill Mode
+    CM_ARGB_MODE_DEMO           = 6,    //Demo Mode
+    CM_ARGB_MODE_FILLFLOW       = 7,    //Fill Flow Mode
+    CM_ARGB_MODE_RAINBOW        = 8,    //Rainbow Mode
+    CM_ARGB_MODE_DIRECT         = 0xFE, //Direct Led Control
+    CM_ARGB_MODE_PASSTHRU       = 0xFF  //Motherboard Pass Thru Mode
+};
+
+enum
+{
+    CM_ARGB_SPEED_SLOWEST       = 0x00, // Slowest speed
+    CM_ARGB_SPEED_SLOW          = 0x01, // Slower speed
+    CM_ARGB_SPEED_NORMAL        = 0x02, // Normal speed
+    CM_ARGB_SPEED_FAST          = 0x03, // Fast speed
+    CM_ARGB_SPEED_FASTEST       = 0x04, // Fastest speed
+};
+
+class CMARGBController
+{
+public:
+    CMARGBController(hid_device* dev_handle, char *_path, unsigned char _zone_idx);
+    ~CMARGBController();
+
+    std::string GetDeviceName();
+    std::string GetSerial();
+    std::string GetLocation();
+
+    unsigned char GetZoneIndex();
+    unsigned char GetMode();
+    unsigned char GetLedRed();
+    unsigned char GetLedGreen();
+    unsigned char GetLedBlue();
+    unsigned char GetLedSpeed();
+    void SetMode(unsigned char mode, unsigned char speed);
+    void SetColor(unsigned char red, unsigned char green, unsigned char blue);
+    void SetLedsDirect(RGBColor * led_colours, unsigned int led_count);
+private:
+    std::string             device_name;
+    std::string             serial;
+    std::string             location;
+    hid_device*             dev;
+
+    unsigned char           zone_index;
+    unsigned char           current_mode;
+    unsigned char           current_speed;
+
+    unsigned char           current_red;
+    unsigned char           current_green;
+    unsigned char           current_blue;
+
+    unsigned int GetLargestColour(unsigned int red, unsigned int green, unsigned int blue);
+    unsigned char GetColourIndex(unsigned char red, unsigned char green, unsigned char blue);
+    void GetStatus();
+    void SendUpdate();
+
+};
@@ -9,23 +9,40 @@

 #include "CMMP750Controller.h"

+static unsigned char colour_mode_data[][6] =
+{
+    { 0x01, 0x04, 0xFF, 0x00, 0xFF, 0x00 },                  /* Static                       */
+    { 0x02, 0x04, 0xFF, 0x00, 0xFF, 0x80 },                  /* Blinking                     */
+    { 0x03, 0x04, 0xFF, 0x00, 0xFF, 0x80 },                  /* Breathing                    */
+    { 0x04, 0x04, 0x80, 0x00, 0x00, 0x00 },                  /* Colour Cycle                 */
+    { 0x05, 0x04, 0x80, 0x00, 0x00, 0x00 }                   /* Colour Breath                */
+};
+
+static unsigned char speed_mode_data[][9] =
+{
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },/* Static                       */
+    { 0xFF, 0xE0, 0xC0, 0xA0, 0x80, 0x60, 0x40, 0x20, 0x00 },/* Blinking                     */
+    { 0xFF, 0xE0, 0xC0, 0xA0, 0x80, 0x60, 0x40, 0x20, 0x00 },/* Breathing                    */
+    { 0xFF, 0xE0, 0xC0, 0xA0, 0x80, 0x60, 0x40, 0x20, 0x00 },/* Colour Cycle                 */
+    { 0xFF, 0xE0, 0xC0, 0xA0, 0x80, 0x60, 0x40, 0x20, 0x00 } /* Colour Breath                */
+};
+
 CMMP750Controller::CMMP750Controller(hid_device* dev_handle, wchar_t *_vendor, wchar_t *_device_name, char *_path)
 {
-    int tmp_size = wcslen(_vendor);
+    std::size_t tmp_size    = wcslen(_vendor);
+    dev                     = dev_handle;
+    location                = _path;

-    dev = dev_handle;
-
-    for (int i=0; ( i<tmp_size && i<CM_DEVICE_NAME_SIZE); i++)
+    for(std::size_t i = 0; (i < tmp_size) && (i < CM_DEVICE_NAME_SIZE); i++)
    {
        device_name[i] = (char)_vendor[i];
    }
-    for (int j=0; ( j<wcslen(_vendor) && tmp_size+j<CM_DEVICE_NAME_SIZE); j++)
-        device_name[tmp_size+j] = (char)_device_name[j];
+    for(std::size_t j = 0; (j < wcslen(_vendor)) && (tmp_size + j < CM_DEVICE_NAME_SIZE); j++)
+    {
+        device_name[tmp_size + j] = (char)_device_name[j];
+    }

-    location = _path;
-
-    current_mode = MP750_MODE_STATIC;
-    current_speed = MP750_SPEED_NORMAL;
+    GetStatus();        //When setting up device get current status
 }

 CMMP750Controller::~CMMP750Controller()
@@ -33,6 +50,38 @@ CMMP750Controller::~CMMP750Controller()
    hid_close(dev);
 }

+void CMMP750Controller::GetStatus()
+{
+    unsigned char buffer[0x40]  = { 0x00 };
+    int buffer_size             = (sizeof(buffer) / sizeof(buffer[0]));
+    buffer[0]                   = 0x07;
+
+    hid_write(dev, buffer, buffer_size);
+    hid_read(dev, buffer, buffer_size);
+
+    if((buffer[0] == 0x80) && (buffer[1] == 0x05))
+    {
+        current_mode  = buffer[2] - 1;
+        current_red   = buffer[3];
+        current_green = buffer[4];
+        current_blue  = buffer[5];
+
+        for(int i = 0; speed_mode_data[current_mode][i] >= buffer[6]; i++)
+        {
+            current_speed = i;
+        }
+    }
+    else
+    {
+        //Code should never reach here however just in case there is a failure set something
+        current_mode  = MP750_MODE_COLOR_CYCLE;      //Unicorn Spew
+        current_red   = 0xFF;
+        current_green = 0xFF;
+        current_blue  = 0xFF;
+        current_speed = MP750_SPEED_NORMAL;
+    }
+}
+
 char* CMMP750Controller::GetDeviceName()
 {
    return device_name;
@@ -48,6 +97,31 @@ std::string CMMP750Controller::GetLocation()
    return location;
 }

+unsigned char CMMP750Controller::GetMode()
+{
+    return current_mode;
+}
+
+unsigned char CMMP750Controller::GetLedRed()
+{
+    return current_red;
+}
+
+unsigned char CMMP750Controller::GetLedGreen()
+{
+    return current_green;
+}
+
+unsigned char CMMP750Controller::GetLedBlue()
+{
+    return current_blue;
+}
+
+unsigned char CMMP750Controller::GetLedSpeed()
+{
+    return current_speed;
+}
+
 void CMMP750Controller::SetMode(unsigned char mode, unsigned char speed)
 {
    current_mode  = mode;
@@ -70,7 +144,7 @@ void CMMP750Controller::SendUpdate()
    unsigned char buffer[0x40] = { 0x00 };
    int buffer_size = (sizeof(buffer) / sizeof(buffer[0]));

-    for(int i = 0; i < CM_COLOUR_MODE_DATA_SIZE; i++)
+    for(std::size_t i = 0; i < CM_COLOUR_MODE_DATA_SIZE; i++)
    {
        buffer[i] = colour_mode_data[current_mode][i];
    }
@@ -78,16 +152,16 @@ void CMMP750Controller::SendUpdate()
   if(current_mode > MP750_MODE_BREATHING)
    { 
        //If the mode is random colours set SPEED at BYTE2
-        buffer[CM_RED_BYTE] = speed_mode_data[current_mode][current_speed];
+        buffer[CM_RED_BYTE]     = speed_mode_data[current_mode][current_speed];
    }
    else
    { 
        //Otherwise SPEED is BYTE5
-        buffer[CM_RED_BYTE] = current_red;
-        buffer[CM_GREEN_BYTE] = current_green;
-        buffer[CM_BLUE_BYTE] = current_blue;
-        buffer[CM_SPEED_BYTE] = speed_mode_data[current_mode][current_speed];
+        buffer[CM_RED_BYTE]     = current_red;
+        buffer[CM_GREEN_BYTE]   = current_green;
+        buffer[CM_BLUE_BYTE]    = current_blue;
+        buffer[CM_SPEED_BYTE]   = speed_mode_data[current_mode][current_speed];
    }

    hid_write(dev, buffer, buffer_size);
-}
+}
@@ -20,7 +20,7 @@

 #pragma once

-#define CM_COLOUR_MODE_DATA_SIZE (sizeof(colour_mode_data) / sizeof(colour_mode_data[0]))
+#define CM_COLOUR_MODE_DATA_SIZE (sizeof(colour_mode_data[0]) / sizeof(colour_mode_data[0][0]))
 #define CM_INTERRUPT_TIMEOUT 250
 #define CM_DEVICE_NAME_SIZE (sizeof(device_name) / sizeof(device_name[ 0 ]))
 #define CM_SERIAL_SIZE (sizeof(serial) / sizeof(serial[ 0 ]))
@@ -44,24 +44,6 @@ enum
    MP750_MODE_BREATH_CYCLE = 0x04  //Breathing Cycle Mode
 };

-static unsigned char colour_mode_data[][6] =
-{
-    { 0x01, 0x04, 0xFF, 0x00, 0xFF, 0x00 },                  /* Static                       */
-    { 0x02, 0x04, 0xFF, 0x00, 0xFF, 0x80 },                  /* Blinking                     */
-    { 0x03, 0x04, 0xFF, 0x00, 0xFF, 0x80 },                  /* Breathing                    */
-    { 0x04, 0x04, 0x80, 0x00, 0x00, 0x00 },                  /* Colour Cycle                 */
-    { 0x05, 0x04, 0x80, 0x00, 0x00, 0x00 }                   /* Colour Breath                */
-};
-
-static unsigned char speed_mode_data[][9] =
-{
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },/* Static                       */
-    { 0xFF, 0xE0, 0xC0, 0xA0, 0x80, 0x60, 0x40, 0x20, 0x00 },/* Blinking                     */
-    { 0xFF, 0xE0, 0xC0, 0xA0, 0x80, 0x60, 0x40, 0x20, 0x00 },/* Breathing                    */
-    { 0xFF, 0xE0, 0xC0, 0xA0, 0x80, 0x60, 0x40, 0x20, 0x00 },/* Colour Cycle                 */
-    { 0xFF, 0xE0, 0xC0, 0xA0, 0x80, 0x60, 0x40, 0x20, 0x00 } /* Colour Breath                */
-};
-
 enum
 {
    MP750_SPEED_SLOWEST              = 0x00, /* Slowest speed                */
@@ -85,6 +67,11 @@ public:
    char* GetSerial();
    std::string GetLocation();

+    unsigned char GetMode();
+    unsigned char GetLedRed();
+    unsigned char GetLedGreen();
+    unsigned char GetLedBlue();
+    unsigned char GetLedSpeed();
    void SetMode(unsigned char mode, unsigned char speed);
    void SetColor(unsigned char red, unsigned char green, unsigned char blue);

@@ -101,5 +88,6 @@ private:
    unsigned char           current_green;
    unsigned char           current_blue;

+    void GetStatus();
    void SendUpdate();
 };
@@ -1,25 +1,33 @@
+#include "Detector.h"
 #include "CMMP750Controller.h"
+#include "CMARGBcontroller.h"
 #include "RGBController.h"
 #include "RGBController_CMMP750Controller.h"
+#include "RGBController_CMARGBController.h"
 #include <hidapi/hidapi.h>

 #define COOLERMASTER_VID                0x2516

 #define COOLERMASTER_MP750_XL_PID       0x0109
 #define COOLERMASTER_MP750_MEDIUM_PID   0x0105
+#define COOLERMASTER_ARGB_PID           0x1011

 #define COOLERMASTER_NUM_DEVICES (sizeof(cm_pids) / sizeof(cm_pids[ 0 ]))

-enum
+struct coolermaster_device
 {
-    CM_PID = 0,
-    CM_INTERFACE = 1
+    unsigned int    product_id;
+    unsigned short  interface;
+    unsigned int    usage_page;
+    unsigned int    usage;
+    device_type     type;
 };

-static const unsigned int cm_pids[][4] =
-{  // PID,      Interface
-    { COOLERMASTER_MP750_XL_PID,        0x00 },     //Coolermaster MP750 (Extra Large)
-    { COOLERMASTER_MP750_MEDIUM_PID,    0x00 }      //Coolermaster MP750 (Medium)
+static const coolermaster_device cm_pids[] =
+{  // PID,                              Interface,  Usage_Page, Usage,  Device_Type
+    { COOLERMASTER_MP750_XL_PID,        0x00,       0xFF00,     0x01,   DEVICE_TYPE_MOUSEMAT  },    //Coolermaster MP750 (Extra Large)
+    { COOLERMASTER_MP750_MEDIUM_PID,    0x00,       0xFF00,     0x01,   DEVICE_TYPE_MOUSEMAT  },    //Coolermaster MP750 (Medium)
+    { COOLERMASTER_ARGB_PID,            0x00,       0xFF00,     0x01,   DEVICE_TYPE_LEDSTRIP  }     //Coolermaster ARGB Controller
 };

 /******************************************************************************************\
@@ -36,19 +44,27 @@ void DetectCoolerMasterControllers(std::vector<RGBController*>& rgb_controllers)

    //Look for the passed in cm_pids
    hid_init();
-    info = hid_enumerate(0x0, 0x0);
+    info = hid_enumerate(COOLERMASTER_VID, 0x0);

    while(info)
    {
        hid_device* dev = NULL;
+        device_type dev_type;
+
        if(info->vendor_id == COOLERMASTER_VID)
        {
-            for(int cm_pid_idx = 0; cm_pid_idx < COOLERMASTER_NUM_DEVICES; cm_pid_idx++)
+            for(unsigned int cm_pid_idx = 0; cm_pid_idx < COOLERMASTER_NUM_DEVICES; cm_pid_idx++)
            {
-                if((info->product_id        == cm_pids[cm_pid_idx][CM_PID])
-                 &&(info->interface_number  == cm_pids[cm_pid_idx][CM_INTERFACE]))
+                if((info->product_id        == cm_pids[cm_pid_idx].product_id)
+#ifdef USE_HID_USAGE
+                    &&(info->usage             == cm_pids[cm_pid_idx].usage)     //Usage and usage page required to get the correct interface
+                    &&(info->usage_page        == cm_pids[cm_pid_idx].usage_page))
+#else
+                    &&(info->interface_number  == cm_pids[cm_pid_idx].interface))
+#endif  //USE_HID_USAGE
                {
-                    dev = hid_open_path(info->path);
+                    dev         = hid_open_path(info->path);
+                    dev_type    = cm_pids[cm_pid_idx].type;
                    break;
                }
            }
@@ -56,11 +72,26 @@ void DetectCoolerMasterControllers(std::vector<RGBController*>& rgb_controllers)

        if(dev)
        {
-            CMMP750Controller* controller = new CMMP750Controller(dev, info->manufacturer_string, info->product_string, info->path);
-            RGBController_CMMP750Controller* rgb_controller = new RGBController_CMMP750Controller(controller);
-            rgb_controllers.push_back(rgb_controller);
+            if (dev_type == DEVICE_TYPE_MOUSEMAT)
+            {
+                CMMP750Controller* controller                   = new CMMP750Controller(dev, info->manufacturer_string, info->product_string, info->path);
+                RGBController_CMMP750Controller* rgb_controller = new RGBController_CMMP750Controller(controller);
+                rgb_controllers.push_back(rgb_controller);
+            }
+            else if(dev_type == DEVICE_TYPE_LEDSTRIP)
+            {
+                for(std::size_t i = 0; i < CM_ARGB_HEADER_DATA_SIZE; i++)
+                {
+                    CMARGBController* controller = new CMARGBController(dev, info->path, i);
+                    RGBController_CMARGBController* rgb_controller = new RGBController_CMARGBController(controller);
+                    rgb_controllers.push_back(rgb_controller);
+                }
+            }
        }
        info = info->next;
    }
    hid_free_enumeration(info);
-}
+
+}   /* DetectCoolerMasterControllers() */
+
+REGISTER_DETECTOR("Cooler Master", DetectCoolerMasterControllers);
@@ -0,0 +1,314 @@
+/*-------------------------------------------------------------------*\
+|  RGBController_CMARGBController.cpp                                 |
+|                                                                     |
+|  Driver for Coolermaster ARGB Controller                            |
+|                                                                     |
+|  Chris M (Dr_No)          14th Oct 2020                             |
+|                                                                     |
+\*-------------------------------------------------------------------*/
+
+#include "RGBController_CMARGBController.h"
+
+RGBController_CMARGBController::RGBController_CMARGBController(CMARGBController *cmargb_ptr)
+{
+    cmargb                  = cmargb_ptr;
+    unsigned char speed     = cmargb->GetLedSpeed();
+
+    name                    = argb_header_data[cmargb->GetZoneIndex()].name;
+    type                    = DEVICE_TYPE_LEDSTRIP;
+    description             = cmargb->GetDeviceName();
+    version                 = "1.0";
+    serial                  = cmargb->GetSerial();
+    location                = cmargb->GetLocation();
+
+    if ( argb_header_data[cmargb->GetZoneIndex()].digital)
+    {
+        mode Off;
+        Off.name                = "Turn Off";
+        Off.value               = CM_ARGB_MODE_OFF;
+        Off.color_mode          = MODE_COLORS_NONE;
+        modes.push_back(Off);
+
+        mode Reload;
+        Reload.name             = "Reload";
+        Reload.value            = CM_ARGB_MODE_RELOAD;
+        Reload.flags            = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
+        Reload.colors_min       = 1;
+        Reload.colors_max       = 1;
+        Reload.colors.resize(Reload.colors_max);
+        Reload.speed_min        = CM_ARGB_SPEED_SLOWEST;
+        Reload.speed_max        = CM_ARGB_SPEED_FASTEST;
+        Reload.color_mode       = MODE_COLORS_RANDOM;
+        Reload.speed            = speed;
+        modes.push_back(Reload);
+
+        mode Recoil;
+        Recoil.name             = "Recoil";
+        Recoil.value            = CM_ARGB_MODE_RECOIL;
+        Recoil.flags            = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
+        Recoil.colors_min       = 1;
+        Recoil.colors_max       = 1;
+        Recoil.colors.resize(Reload.colors_max);
+        Recoil.speed_min        = CM_ARGB_SPEED_SLOWEST;
+        Recoil.speed_max        = CM_ARGB_SPEED_FASTEST;
+        Recoil.color_mode       = MODE_COLORS_RANDOM;
+        Recoil.speed            = speed;
+        modes.push_back(Recoil);
+
+        mode Breathing;
+        Breathing.name          = "Breathing";
+        Breathing.value         = CM_ARGB_MODE_BREATHING;
+        Breathing.flags         = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
+        Breathing.colors_min    = 1;
+        Breathing.colors_max    = 1;
+        Breathing.colors.resize(Reload.colors_max);
+        Breathing.speed_min     = CM_ARGB_SPEED_SLOWEST;
+        Breathing.speed_max     = CM_ARGB_SPEED_FASTEST;
+        Breathing.color_mode    = MODE_COLORS_RANDOM;
+        Breathing.speed         = speed;
+        modes.push_back(Breathing);
+
+        mode Refill;
+        Refill.name             = "Refill";
+        Refill.value            = CM_ARGB_MODE_REFILL;
+        Refill.flags            = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
+        Refill.colors_min       = 1;
+        Refill.colors_max       = 1;
+        Refill.colors.resize(Reload.colors_max);
+        Refill.speed_min        = CM_ARGB_SPEED_SLOWEST;
+        Refill.speed_max        = CM_ARGB_SPEED_FASTEST;
+        Refill.color_mode       = MODE_COLORS_RANDOM;
+        Refill.speed            = speed;
+        modes.push_back(Refill);
+
+        mode Demo;
+        Demo.name               = "Demo";
+        Demo.value              = CM_ARGB_MODE_DEMO;
+        Demo.flags              = MODE_FLAG_HAS_SPEED;
+        Demo.speed_min          = CM_ARGB_SPEED_SLOWEST;
+        Demo.speed_max          = CM_ARGB_SPEED_FASTEST;
+        Demo.color_mode         = MODE_COLORS_NONE;
+        Demo.speed              = speed;
+        modes.push_back(Demo);
+
+        mode Spectrum;
+        Spectrum.name           = "Spectrum";
+        Spectrum.value          = CM_ARGB_MODE_SPECTRUM;
+        Spectrum.flags          = MODE_FLAG_HAS_SPEED;
+        Spectrum.speed_min      = CM_ARGB_SPEED_SLOWEST;
+        Spectrum.speed_max      = CM_ARGB_SPEED_FASTEST;
+        Spectrum.color_mode     = MODE_COLORS_NONE;
+        Spectrum.speed          = speed;
+        modes.push_back(Spectrum);
+
+        mode FillFlow;
+        FillFlow.name           = "Fill Flow";
+        FillFlow.value          = CM_ARGB_MODE_FILLFLOW;
+        FillFlow.flags          = MODE_FLAG_HAS_SPEED;
+        FillFlow.speed_min      = CM_ARGB_SPEED_SLOWEST;
+        FillFlow.speed_max      = CM_ARGB_SPEED_FASTEST;
+        FillFlow.color_mode     = MODE_COLORS_NONE;
+        FillFlow.speed          = speed;
+        modes.push_back(FillFlow);
+
+        mode Rainbow;
+        Rainbow.name            = "Rainbow";
+        Rainbow.value           = CM_ARGB_MODE_RAINBOW;
+        Rainbow.flags           = MODE_FLAG_HAS_SPEED;
+        Rainbow.speed_min       = CM_ARGB_SPEED_SLOWEST;
+        Rainbow.speed_max       = CM_ARGB_SPEED_FASTEST;
+        Rainbow.color_mode      = MODE_COLORS_NONE;
+        Rainbow.speed           = speed;
+        modes.push_back(Rainbow);
+
+        mode Direct;
+        Direct.name             = "Direct";
+        Direct.value            = CM_ARGB_MODE_DIRECT;
+        Direct.flags            = MODE_FLAG_HAS_PER_LED_COLOR;
+        Direct.color_mode       = MODE_COLORS_PER_LED;
+        modes.push_back(Direct);
+
+        mode PassThru;
+        PassThru.name           = "Pass Thru";
+        PassThru.value          = CM_ARGB_MODE_PASSTHRU;
+        PassThru.color_mode     = MODE_COLORS_NONE;
+        modes.push_back(PassThru);
+    }
+    else
+    {
+        mode Off;
+        Off.name                = "Turn Off";
+        Off.value               = CM_RGB_MODE_OFF;
+        Off.color_mode          = MODE_COLORS_NONE;
+        modes.push_back(Off);
+
+        mode Breathing;
+        Breathing.name          = "Breathing";
+        Breathing.value         = CM_RGB_MODE_BREATHING;
+        Breathing.flags         = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
+        Breathing.colors_min    = 1;
+        Breathing.colors_max    = 1;
+        Breathing.colors.resize(Breathing.colors_max);
+        Breathing.speed_min     = CM_ARGB_SPEED_SLOWEST;
+        Breathing.speed_max     = CM_ARGB_SPEED_FASTEST;
+        Breathing.color_mode    = MODE_COLORS_RANDOM;
+        Breathing.speed         = speed;
+        modes.push_back(Breathing);
+
+        mode Flash;
+        Breathing.name          = "Flash";
+        Breathing.value         = CM_RGB_MODE_FLASH;
+        Breathing.flags         = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
+        Breathing.colors_min    = 1;
+        Breathing.colors_max    = 1;
+        Breathing.colors.resize(Breathing.colors_max);
+        Breathing.speed_min     = CM_ARGB_SPEED_SLOWEST;
+        Breathing.speed_max     = CM_ARGB_SPEED_FASTEST;
+        Breathing.color_mode    = MODE_COLORS_RANDOM;
+        Breathing.speed         = speed;
+        modes.push_back(Breathing);
+
+        mode ColourCycle;
+        ColourCycle.name          = "Colour Cycle";
+        ColourCycle.value         = CM_RGB_MODE_COLOUR_CYCLE;
+        ColourCycle.flags         = MODE_FLAG_HAS_SPEED;
+        ColourCycle.speed_min     = CM_ARGB_SPEED_SLOWEST;
+        ColourCycle.speed_max     = CM_ARGB_SPEED_FASTEST;
+        ColourCycle.color_mode    = MODE_COLORS_NONE;
+        ColourCycle.speed         = speed;
+        modes.push_back(ColourCycle);
+
+        mode PassThru;
+        PassThru.name           = "Pass Thru";
+        PassThru.value          = CM_RGB_MODE_PASSTHRU;
+        PassThru.color_mode     = MODE_COLORS_NONE;
+        modes.push_back(PassThru);
+    }
+
+    Init_Controller();         //Only processed on first run
+    SetupZones();
+    //active_mode = cmargb->GetMode();
+}
+
+RGBController_CMARGBController::~RGBController_CMARGBController()
+{
+
+}
+
+void RGBController_CMARGBController::Init_Controller()
+{
+    int zone_idx            = cmargb->GetZoneIndex();
+    int zone_led_count      = argb_header_data[zone_idx].count;
+    bool boolSingleLED      = ( zone_led_count == 1 );          //If argb_header_data[zone_idx].count == 1 then the zone is ZONE_TYPE_SINGLE
+
+    zone ARGB_zone;
+    ARGB_zone.name          = std::to_string(zone_idx);
+    ARGB_zone.type          = (boolSingleLED) ? ZONE_TYPE_SINGLE : ZONE_TYPE_LINEAR;
+    ARGB_zone.leds_min      = 0;
+    ARGB_zone.leds_max      = 64;
+    ARGB_zone.leds_count    = zone_led_count;
+    ARGB_zone.matrix_map    = NULL;
+    zones.push_back(ARGB_zone);
+}
+
+void RGBController_CMARGBController::SetupZones()
+{
+    /*-------------------------------------------------*\
+    | Clear any existing color/LED configuration        |
+    \*-------------------------------------------------*/
+    leds.clear();
+    colors.clear();
+
+    /*---------------------------------------------------------*\
+    | Set up zones                                              |
+    \*---------------------------------------------------------*/
+    for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
+    {
+        bool boolSingleLED = (zones[zone_idx].type == ZONE_TYPE_SINGLE);    //Calculated for later use
+
+        for(unsigned int lp_idx = 0; lp_idx < zones[zone_idx].leds_count; lp_idx++)
+        {
+            led     new_led;
+            unsigned int i = std::stoi(zones[zone_idx].name);
+
+            if(boolSingleLED)
+            {
+                new_led.name  = i;
+                new_led.value = argb_header_data[i].header;
+            }
+            else
+            {
+                new_led.name = i;
+                new_led.name.append(" LED " + std::to_string(lp_idx));
+                new_led.value = argb_header_data[i].header;
+            }
+
+            leds.push_back(new_led);
+        }
+    }
+
+    SetupColors();
+}
+
+void RGBController_CMARGBController::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();
+    }
+}
+
+void RGBController_CMARGBController::DeviceUpdateLEDs()
+{
+    /*unsigned char red = RGBGetRValue(colors[0]);
+    unsigned char grn = RGBGetGValue(colors[0]);
+    unsigned char blu = RGBGetBValue(colors[0]);
+    cmargb->SetColor(red, grn, blu);*/
+
+    //this one
+    cmargb->SetMode( modes[active_mode].value, modes[active_mode].speed );
+    cmargb->SetLedsDirect( zones[0].colors, zones[0].leds_count );
+}
+
+void RGBController_CMARGBController::UpdateZoneLEDs(int zone)
+{
+    RGBColor      colour    = colors[zone];
+    unsigned char red       = RGBGetRValue(colour);
+    unsigned char grn       = RGBGetGValue(colour);
+    unsigned char blu       = RGBGetBValue(colour);
+    cmargb->SetColor(red, grn, blu);
+}
+
+void RGBController_CMARGBController::UpdateSingleLED(int led)
+{
+        //cmargb->SetMode( modes[active_mode].value, modes[active_mode].speed );
+        //cmargb->SetLedsDirect( zones[0].colors, zones[0].leds_count );
+}
+
+void RGBController_CMARGBController::SetCustomMode()
+{
+    active_mode = CM_ARGB_MODE_DIRECT;
+}
+
+void RGBController_CMARGBController::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]);
+        cmargb->SetColor(red, grn, blu);
+    }
+    else
+    {
+        cmargb->SetColor(0, 0, 0);        //If the mode is not colour specific then set colour to black for the random index
+    }
+    cmargb->SetMode( modes[active_mode].value, modes[active_mode].speed );
+}
@@ -0,0 +1,35 @@
+/*-------------------------------------------------------------------*\
+|  RGBController_CMARGBController.h                                   |
+|                                                                     |
+|  Driver for Coolermaster ARGB Controller                            |
+|                                                                     |
+|  Chris M (Dr_No)          14th Oct 2020                             |
+|                                                                     |
+\*-------------------------------------------------------------------*/
+
+#pragma once
+#include "RGBController.h"
+#include "CMARGBcontroller.h"
+#include <vector>
+
+class RGBController_CMARGBController : public RGBController
+{
+public:
+    RGBController_CMARGBController(CMARGBController* cmargb_ptr);
+    ~RGBController_CMARGBController();
+
+    void        SetupZones();
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        SetCustomMode();
+    void        DeviceUpdateMode();
+private:
+    void        Init_Controller();
+    int         GetDeviceMode();
+
+    CMARGBController* cmargb;
+};
@@ -11,14 +11,15 @@

 RGBController_CMMP750Controller::RGBController_CMMP750Controller(CMMP750Controller* cmmp_ptr)
 {
-    cmmp750     = cmmp_ptr;
+    cmmp750             = cmmp_ptr;
+    unsigned char speed = cmmp750->GetLedSpeed();

-    name        = cmmp750->GetDeviceName();
-    type        = DEVICE_TYPE_MOUSEMAT;
-    description = cmmp750->GetDeviceName();
-    version     = "1.0";
-    serial      = "";
-    location    = cmmp750->GetLocation();
+    name                = cmmp750->GetDeviceName();
+    type                = DEVICE_TYPE_MOUSEMAT;
+    description         = cmmp750->GetDeviceName();
+    version             = "1.0";
+    serial              = "";
+    location            = cmmp750->GetLocation();

    mode Static;
    Static.name       = "Static";
@@ -34,7 +35,7 @@ RGBController_CMMP750Controller::RGBController_CMMP750Controller(CMMP750Controll
    Blink.speed_min  = MP750_SPEED_SLOWEST;
    Blink.speed_max  = MP750_SPEED_FASTEST;
    Blink.color_mode = MODE_COLORS_PER_LED;
-    Blink.speed      = MP750_SPEED_NORMAL;
+    Blink.speed      = speed;
    modes.push_back(Blink);

    mode Breathing;
@@ -44,7 +45,7 @@ RGBController_CMMP750Controller::RGBController_CMMP750Controller(CMMP750Controll
    Breathing.speed_min  = MP750_SPEED_SLOWEST;
    Breathing.speed_max  = MP750_SPEED_FASTEST;
    Breathing.color_mode = MODE_COLORS_PER_LED;
-    Breathing.speed      = MP750_SPEED_NORMAL;
+    Breathing.speed      = speed;
    modes.push_back(Breathing);

    mode ColorCycle;
@@ -54,7 +55,7 @@ RGBController_CMMP750Controller::RGBController_CMMP750Controller(CMMP750Controll
    ColorCycle.speed_min  = MP750_SPEED_SLOWEST;
    ColorCycle.speed_max  = MP750_SPEED_FASTEST;
    ColorCycle.color_mode = MODE_COLORS_NONE;
-    ColorCycle.speed      = MP750_SPEED_NORMAL;
+    ColorCycle.speed      = speed;
    modes.push_back(ColorCycle);

    mode BreathCycle;
@@ -64,10 +65,11 @@ RGBController_CMMP750Controller::RGBController_CMMP750Controller(CMMP750Controll
    BreathCycle.speed_min  = MP750_SPEED_SLOWEST;
    BreathCycle.speed_max  = MP750_SPEED_FASTEST;
    BreathCycle.color_mode = MODE_COLORS_NONE;
-    BreathCycle.speed      = MP750_SPEED_NORMAL;
+    BreathCycle.speed      = speed;
    modes.push_back(BreathCycle);

    SetupZones();
+    active_mode = cmmp750->GetMode();
 }

 RGBController_CMMP750Controller::~RGBController_CMMP750Controller()
@@ -91,6 +93,18 @@ void RGBController_CMMP750Controller::SetupZones()
    leds.push_back(MP_led);

    SetupColors();
+
+    /*---------------------------------------------------------*\
+    | Initialize colors for each LED                            |
+    \*---------------------------------------------------------*/
+    for(std::size_t led_idx = 0; led_idx < leds.size(); led_idx++)
+    {
+        unsigned char red = cmmp750->GetLedRed();
+        unsigned char grn = cmmp750->GetLedGreen();
+        unsigned char blu = cmmp750->GetLedBlue();
+
+        colors[led_idx] = ToRGBColor(red, grn, blu);
+    }
 }

 void RGBController_CMMP750Controller::ResizeZone(int /*zone*/, int /*new_size*/)
@@ -127,7 +141,7 @@ void RGBController_CMMP750Controller::SetCustomMode()
    active_mode = 0;
 }

-void RGBController_CMMP750Controller::UpdateMode()
+void RGBController_CMMP750Controller::DeviceUpdateMode()
 {
    switch(modes[active_mode].value)
    {
@@ -25,7 +25,9 @@ public:
    void        UpdateSingleLED(int led);

    void        SetCustomMode();
-    void        UpdateMode();
+    void        DeviceUpdateMode();
 private:
    CMMP750Controller* cmmp750;
+
+    int         GetDeviceMode();
 };
@@ -0,0 +1,126 @@
+/*------------------------------------------*\
+|  CorsairDominatorPlatinumController.cpp    |  
+|                                            |
+|  Drover for Corsair Domintator Platinum    |
+|  RGB RAM lighting controller               |
+|                                            |
+|  Erik Gilling (konkers)       9/25/2020    |
+\*------------------------------------------*/
+
+#include "CorsairDominatorPlatinumController.h"
+
+#include <cstring>
+
+using namespace std::chrono_literals;
+
+CorsairDominatorPlatinumController::CorsairDominatorPlatinumController(i2c_smbus_interface *bus, corsair_dev_id dev)
+{
+    this->bus = bus;
+    this->dev = dev;
+
+    led_data[0] = 0xc;
+}
+
+CorsairDominatorPlatinumController::~CorsairDominatorPlatinumController()
+{
+
+}
+
+std::string CorsairDominatorPlatinumController::GetDeviceName()
+{
+    return "Corsair Dominator Platinum RGB";
+}
+
+std::string CorsairDominatorPlatinumController::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 CorsairDominatorPlatinumController::SetAllColors
+    (
+    unsigned char   red,
+    unsigned char   green,
+    unsigned char   blue
+    )
+{
+    for(unsigned int led = 0; led < CORSAIR_PLAT_LED_COUNT; led++)
+    {
+        SetLEDColor(led, red, green, blue);
+    }
+}
+
+void CorsairDominatorPlatinumController::SetLEDColor
+    (
+    unsigned int    led,
+    unsigned char   red,
+    unsigned char   green,
+    unsigned char   blue
+    )
+{
+    if(led >= CORSAIR_PLAT_LED_COUNT)
+    {
+        return;
+    }
+
+    unsigned int offset     = (led * 3) + 1;
+    led_data[offset]        = red;
+    led_data[offset + 1]    = green;
+    led_data[offset + 2]    = blue;
+}
+
+unsigned char CorsairDominatorPlatinumController::crc8
+    (
+    unsigned char   init,
+    unsigned char   poly,
+    unsigned char*  data,
+    unsigned char   len
+    )
+{
+    unsigned char crc = init;
+
+    for(unsigned int i = 0; i < len; i++)
+    {
+        unsigned char val = data[i];
+        for(unsigned char mask = 0x80; mask != 0; mask >>= 1)
+        {
+            unsigned char bit;
+            if ((val & mask) != 0)
+            {
+                bit = (crc & 0x80) ^ 0x80;
+            }
+            else
+            {
+                bit = crc & 0x80;
+            }
+
+            if (bit == 0)
+            {
+                crc <<= 1;
+            }
+            else
+            {
+                crc = (crc << 1) ^ poly;
+            }
+        }
+    }
+
+    return crc;
+}
+
+void CorsairDominatorPlatinumController::ApplyColors()
+{
+    unsigned char data[sizeof(led_data)];
+    memcpy(data, led_data, sizeof(led_data));
+    unsigned char crc = crc8(0x0, 0x7, data, sizeof(data) - 1);
+    data[sizeof(data) - 1] = crc;
+
+    bus->i2c_smbus_write_block_data(dev, 0x31, 0x20, data);
+    std::this_thread::sleep_for(800us);
+    bus->i2c_smbus_write_block_data(dev, 0x32, sizeof(data) - 0x20, data + 0x20);
+    std::this_thread::sleep_for(200us);
+}
@@ -0,0 +1,42 @@
+/*-----------------------------------------*\
+|  CorsairDominatorPlatinumController.h     |
+|                                           |
+|  Definitions and types for Corsair        |
+|  Domintator Platinum RGB RAM lighting     |
+|   controller                              |
+|                                           |
+|  Erik Gilling (konkers)       9/25/2020   |
+\*-----------------------------------------*/
+
+#include <string>
+#include "i2c_smbus.h"
+
+#pragma once
+
+typedef unsigned char corsair_dev_id;
+
+class CorsairDominatorPlatinumController
+{
+public:
+    CorsairDominatorPlatinumController(i2c_smbus_interface *bus, corsair_dev_id dev);
+    ~CorsairDominatorPlatinumController();
+
+    std::string GetDeviceName();
+    std::string GetDeviceLocation();
+
+    size_t GetLEDCount() { return CORSAIR_PLAT_LED_COUNT; }
+    void SetAllColors(unsigned char red, unsigned char green, unsigned char blue);
+    void SetLEDColor(unsigned int led, unsigned char red, unsigned char green, unsigned char blue);
+    void ApplyColors();
+    bool WaitReady();
+
+private:
+    static constexpr size_t CORSAIR_PLAT_LED_COUNT = 12;
+
+    unsigned char led_data[CORSAIR_PLAT_LED_COUNT * 3 + 2];
+
+    i2c_smbus_interface*    bus;
+    corsair_dev_id          dev;
+
+    static unsigned char crc8(unsigned char init, unsigned char poly, unsigned char *data, unsigned char len);
+};
@@ -0,0 +1,70 @@
+#include "Detector.h"
+#include "CorsairDominatorPlatinumController.h"
+#include "RGBController.h"
+#include "RGBController_CorsairDominatorPlatinum.h"
+#include "i2c_smbus.h"
+#include "pci_ids.h"
+#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
+
+using namespace std::chrono_literals;
+
+bool TestForCorsairDominatorPlatinumController(i2c_smbus_interface *bus, unsigned char address)
+{
+
+    int res = bus->i2c_smbus_write_quick(address, I2C_SMBUS_WRITE);
+    if(res < 0)
+    {
+        return false;
+    }
+
+    res = bus->i2c_smbus_read_byte_data(address, 0x43);
+
+    if(res != 0x1b)
+    {
+        return false;
+    }
+
+    res = bus->i2c_smbus_read_byte_data(address, 0x44);
+
+    if(res != 0x04)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectCorsairDominatorPlatinumControllers                                              *
+*                                                                                          *
+*       Detect Corsair Dominator Platinum controllers on the enumerated I2C busses.        *
+*                                                                                          *
+*           bus - pointer to i2c_smbus_interface where Aura device is connected            *
+*           dev - I2C address of Aura device                                               *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectCorsairDominatorPlatinumControllers(std::vector<i2c_smbus_interface *> &busses, std::vector<RGBController *> &rgb_controllers)
+{
+    for(unsigned int bus = 0; bus < busses.size(); bus++)
+    {
+        IF_DRAM_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device)
+        {
+            for(unsigned char addr = 0x58; addr <= 0x5f; addr++)
+            {
+                if(TestForCorsairDominatorPlatinumController(busses[bus], addr))
+                {
+                    CorsairDominatorPlatinumController* new_controller        = new CorsairDominatorPlatinumController(busses[bus], addr);
+                    RGBController_CorsairDominatorPlatinum* new_rgbcontroller = new RGBController_CorsairDominatorPlatinum(new_controller);
+                    rgb_controllers.push_back(new_rgbcontroller);
+                }
+                std::this_thread::sleep_for(10ms);
+            }
+        }
+    }
+}
+
+REGISTER_I2C_DETECTOR("Corsair Dominator Platinum", DetectCorsairDominatorPlatinumControllers);
@@ -0,0 +1,108 @@
+/*-------------------------------------------------*\
+|  RGBController_CorsairDominatorPlatinum.cpp       |
+|                                                   |
+|  Corsair Vengeance Pro RGB driver                 |
+|                                                   |
+|  Erik Gilling (konkers)       9/25/2020           |
+\*-------------------------------------------------*/
+
+#include "RGBController_CorsairDominatorPlatinum.h"
+
+RGBController_CorsairDominatorPlatinum::RGBController_CorsairDominatorPlatinum(CorsairDominatorPlatinumController* corsair_ptr)
+{
+    corsair = corsair_ptr;
+
+    name        = corsair->GetDeviceName();
+    type        = DEVICE_TYPE_DRAM;
+    description = "Corsair Dominator Platinum RGB Device";
+    location    = corsair->GetDeviceLocation();
+
+    mode Direct;
+    Direct.name       = "Direct";
+    Direct.value      = 0;
+    Direct.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.speed_min  = 0;
+    Direct.speed_max  = 0;
+    Direct.speed      = 0;
+    Direct.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
+    SetupZones();
+
+    active_mode = 0;
+}
+
+void RGBController_CorsairDominatorPlatinum::SetupZones()
+{
+    /*---------------------------------------------------------*\
+    | Set up zone                                               |
+    \*---------------------------------------------------------*/
+    zone new_zone;
+    new_zone.name       = "Corsair Platinum Zone";
+    new_zone.type       = ZONE_TYPE_LINEAR;
+    new_zone.leds_min   = corsair->GetLEDCount();
+    new_zone.leds_max   = corsair->GetLEDCount();
+    new_zone.leds_count = corsair->GetLEDCount();
+    new_zone.matrix_map = NULL;
+    zones.push_back(new_zone);
+
+    /*---------------------------------------------------------*\
+    | Set up LEDs                                               |
+    \*---------------------------------------------------------*/
+    for(std::size_t led_idx = 0; led_idx < zones[0].leds_count; led_idx++)
+    {
+        led *new_led  = new led();
+        new_led->name = "Corsair Platinum LED ";
+        new_led->name.append(std::to_string(led_idx));
+        leds.push_back(*new_led);
+    }
+
+    SetupColors();
+}
+
+void RGBController_CorsairDominatorPlatinum::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_CorsairDominatorPlatinum::DeviceUpdateLEDs()
+{
+    for(std::size_t led = 0; led < colors.size(); led++)
+    {
+        RGBColor color    = colors[led];
+        unsigned char red = RGBGetRValue(color);
+        unsigned char grn = RGBGetGValue(color);
+        unsigned char blu = RGBGetBValue(color);
+        corsair->SetLEDColor(led, red, grn, blu);
+    }
+
+    corsair->ApplyColors();
+}
+
+void RGBController_CorsairDominatorPlatinum::UpdateZoneLEDs(int /*zone*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_CorsairDominatorPlatinum::UpdateSingleLED(int led)
+{
+    RGBColor color    = colors[led];
+    unsigned char red = RGBGetRValue(color);
+    unsigned char grn = RGBGetGValue(color);
+    unsigned char blu = RGBGetBValue(color);
+
+    corsair->SetLEDColor(led, red, grn, blu);
+    corsair->ApplyColors();
+}
+
+void RGBController_CorsairDominatorPlatinum::SetCustomMode()
+{
+    active_mode = 0;
+}
+
+void RGBController_CorsairDominatorPlatinum::DeviceUpdateMode()
+{
+
+}
@@ -0,0 +1,32 @@
+/*--------------------------------------------*\
+|  RGBController_CorsairDominatorPlatinum.h    |
+|                                              |
+|  Corsair Dominator Platinum RGB driver       |
+|                                              |
+|  Erik Gilling (konkers)       9/25/2020      |
+\*--------------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "CorsairDominatorPlatinumController.h"
+
+class RGBController_CorsairDominatorPlatinum : public RGBController
+{
+public:
+    RGBController_CorsairDominatorPlatinum(CorsairDominatorPlatinumController* corsair_ptr);
+
+    void SetupZones();
+
+    void ResizeZone(int zone, int new_size);
+
+    void DeviceUpdateLEDs();
+    void UpdateZoneLEDs(int zone);
+    void UpdateSingleLED(int led);
+
+    void SetCustomMode();
+    void DeviceUpdateMode();
+
+private:
+    CorsairDominatorPlatinumController* corsair;
+};
@@ -0,0 +1,251 @@
+/*---------------------------------------------------------*\
+|  Processing Code for Corsair Hydro Series                 |
+|                                                           |
+|  Adam Honse ([email protected]), 8/17/2020        |
+\*---------------------------------------------------------*/
+
+#include "CorsairHydroController.h"
+
+#include <cstring>
+
+CorsairHydroController::CorsairHydroController(libusb_device_handle* dev_handle)
+{
+    dev = dev_handle;
+
+    SendInit();
+
+    SendFirmwareRequest();
+}
+
+std::string CorsairHydroController::GetFirmwareString()
+{
+    return(firmware_version);
+}
+
+void CorsairHydroController::SetBlink
+    (
+        std::vector<RGBColor> & colors,
+        unsigned char           speed
+    )
+{
+    SendColors(colors);
+    SendSpeed(speed);
+    SendApplyBlink();
+}
+
+void CorsairHydroController::SetFixed
+    (
+        std::vector<RGBColor> & colors
+    )
+{
+    SendColors(colors);
+
+    /*-----------------------------------------------------*\
+    | Fixed mode seems to just be shift mode with the same  |
+    | value for both colors                                 |
+    \*-----------------------------------------------------*/    
+    SendApplyShift();
+}
+
+void CorsairHydroController::SetPulse
+    (
+        std::vector<RGBColor> & colors,
+        unsigned char           speed
+    )
+{
+    SendColors(colors);
+    SendSpeed(speed);
+    SendApplyPulse();
+}
+
+void CorsairHydroController::SetShift
+    (
+        std::vector<RGBColor> & colors,
+        unsigned char           speed
+    )
+{
+    SendColors(colors);
+    SendSpeed(speed);
+    SendApplyShift();
+}
+
+/*-------------------------------------------------------------------------------------------------*\
+| Private packet sending functions.                                                                 |
+\*-------------------------------------------------------------------------------------------------*/
+
+void CorsairHydroController::SendApplyBlink()
+{
+    unsigned char usb_buf[3];
+    int           actual;
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Apply Blink packet                             |
+    \*-----------------------------------------------------*/
+    usb_buf[0] = 0x58;
+    usb_buf[1] = 0x01;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    libusb_bulk_transfer(dev, 0x01, usb_buf, 2, &actual, 1000);
+    libusb_bulk_transfer(dev, 0x81, usb_buf, 3, &actual, 1000);
+}
+
+void CorsairHydroController::SendApplyPulse()
+{
+    unsigned char usb_buf[3];
+    int           actual;
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Apply Pulse packet                             |
+    \*-----------------------------------------------------*/
+    usb_buf[0] = 0x52;
+    usb_buf[1] = 0x01;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    libusb_bulk_transfer(dev, 0x01, usb_buf, 2, &actual, 1000);
+    libusb_bulk_transfer(dev, 0x81, usb_buf, 3, &actual, 1000);
+}
+
+void CorsairHydroController::SendApplyShift()
+{
+    unsigned char usb_buf[3];
+    int           actual;
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Apply Shift packet                             |
+    \*-----------------------------------------------------*/
+    usb_buf[0] = 0x55;
+    usb_buf[1] = 0x01;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    libusb_bulk_transfer(dev, 0x01, usb_buf, 2, &actual, 1000);
+    libusb_bulk_transfer(dev, 0x81, usb_buf, 3, &actual, 1000);
+}
+
+void CorsairHydroController::SendFirmwareRequest()
+{
+    unsigned char usb_buf[8];
+    int           actual;
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Firmware Request packet                        |
+    \*-----------------------------------------------------*/
+    usb_buf[0] = 0xAA;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    libusb_bulk_transfer(dev, 0x01, usb_buf, 1, &actual, 1000);
+    libusb_bulk_transfer(dev, 0x81, usb_buf, 7, &actual, 1000);
+
+    firmware_version = std::to_string(usb_buf[3]) + "." + std::to_string(usb_buf[4]) + "." + std::to_string(usb_buf[5]) + "." + std::to_string(usb_buf[6]);
+}
+
+void CorsairHydroController::SendColors
+    (
+        std::vector<RGBColor> & colors
+    )
+{
+    unsigned char usb_buf[23];
+    int           actual;
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Send Colors packet                             |
+    \*-----------------------------------------------------*/
+    usb_buf[0] = 0x56;
+    usb_buf[1] = colors.size();
+
+    /*---------------------------------------------------------*\
+    | Fill in colors from vector                                |
+    \*---------------------------------------------------------*/
+    for(std::size_t color_idx = 0; color_idx < colors.size(); color_idx++)
+    {
+        usb_buf[(color_idx * 3) + 2] = RGBGetRValue(colors[color_idx]);
+        usb_buf[(color_idx * 3) + 3] = RGBGetGValue(colors[color_idx]);
+        usb_buf[(color_idx * 3) + 4] = RGBGetBValue(colors[color_idx]);
+
+        /*---------------------------------------------------------*\
+        | If the color vector only has one entry, duplicate it, as  |
+        | the controller appears to require two colors in order to  |
+        | update.                                                   |
+        \*---------------------------------------------------------*/
+        if((color_idx == 0) && colors.size() == 1)
+        {
+            usb_buf[1]                   = colors.size() + 1;
+            usb_buf[(color_idx * 3) + 5] = RGBGetRValue(colors[color_idx]);
+            usb_buf[(color_idx * 3) + 6] = RGBGetGValue(colors[color_idx]);
+            usb_buf[(color_idx * 3) + 7] = RGBGetBValue(colors[color_idx]);
+        }
+    }
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    libusb_bulk_transfer(dev, 0x01, usb_buf, 2 + (usb_buf[1] * 3), &actual, 1000);
+    libusb_bulk_transfer(dev, 0x81, usb_buf, 3, &actual, 1000);
+}
+
+void CorsairHydroController::SendInit()
+{
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    libusb_control_transfer( dev, 0x40, 0x00, 0xffff, 0x0000, NULL, 0, 0 );
+    libusb_control_transfer( dev, 0x40, 0x02, 0x0002, 0x0000, NULL, 0, 0 );
+}
+
+void CorsairHydroController::SendSpeed
+    (
+        unsigned char           speed
+    )
+{
+    unsigned char usb_buf[3];
+    int           actual;
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Send Speed packet                              |
+    \*-----------------------------------------------------*/
+    usb_buf[0] = 0x53;
+    usb_buf[1] = speed;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    libusb_bulk_transfer(dev, 0x01, usb_buf, 2, &actual, 1000);
+    libusb_bulk_transfer(dev, 0x81, usb_buf, 3, &actual, 1000);
+}
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------*\
+|  Definitions for Corsair Hydro Series                     |
+|                                                           |
+|  Adam Honse ([email protected]), 8/17/2020        |
+\*---------------------------------------------------------*/
+
+#include "RGBController.h"
+#include <vector>
+#include <libusb-1.0/libusb.h>
+
+#pragma once
+
+enum
+{
+    CORSAIR_HYDRO_CMD_READ_PUMP_SPEED   = 0x31,
+    CORSAIR_HYDRO_CMD_WRITE_PUMP_MODE   = 0x32,
+    CORSAIR_HYDRO_CMD_READ_PUMP_MODE    = 0x33,
+    CORSAIR_HYDRO_CMD_READ_FAN_SPEED    = 0x41,
+    CORSAIR_HYDRO_CMD_READ_AIO_TEMP     = 0xA9,
+    CORSAIR_HYDRO_CMD_READ_FIRMWARE     = 0xAA,
+};
+
+enum
+{
+    CORSAIR_HYDRO_PUMP_MODE_QUIET       = 0x00,
+    CORSAIR_HYDRO_PUMP_MODE_BALANCED    = 0x01,
+    CORSAIR_HYDRO_PUMP_MODE_PERFORMANCE = 0x02,
+};
+
+class CorsairHydroController
+{
+public:
+    CorsairHydroController(libusb_device_handle* dev_handle);
+    ~CorsairHydroController();
+
+    unsigned char   GetFanPercent(unsigned char fan_channel);
+
+    unsigned short  GetFanRPM(unsigned char fan_channel);
+
+    std::string     GetFirmwareString();
+
+    void            SetBlink
+                        (
+                            std::vector<RGBColor> & colors,
+                            unsigned char           speed
+                        );
+
+    void            SetFixed
+                        (
+                            std::vector<RGBColor> & colors
+                        );
+
+    void            SetPulse
+                        (
+                            std::vector<RGBColor> & colors,
+                            unsigned char           speed
+                        );
+
+    void            SetShift
+                        (
+                            std::vector<RGBColor> & colors,
+                            unsigned char           speed
+                        );    
+
+private:
+    libusb_device_handle*   dev;
+    std::string             firmware_version;
+
+    void            SendApplyBlink();
+    void            SendApplyPulse();
+    void            SendApplyShift();
+
+    void            SendColors
+                        (
+                            std::vector<RGBColor> & colors
+                        );
+
+    void            SendFirmwareRequest();
+
+    void            SendInit();
+
+    void            SendSpeed
+                        (
+                            unsigned char           speed
+                        );
+};
@@ -0,0 +1,74 @@
+#include "Detector.h"
+#include "CorsairHydroController.h"
+#include "RGBController.h"
+#include "RGBController_CorsairHydro.h"
+#include <vector>
+#include <libusb-1.0/libusb.h>
+
+/*-----------------------------------------------------*\
+| Corsair vendor ID                                     |
+\*-----------------------------------------------------*/
+#define CORSAIR_VID                     0x1B1C
+
+/*-----------------------------------------------------*\
+| Keyboard Hydro Series product IDs                     |
+\*-----------------------------------------------------*/
+#define CORSAIR_H115I_PRO_RGB_PID       0x0C13
+#define CORSAIR_H100I_PRO_RGB_PID       0x0C15
+#define CORSAIR_H150I_PRO_RGB_PID       0x0C12
+
+typedef struct
+{
+    unsigned short  usb_vid;
+    unsigned short  usb_pid;
+    unsigned char   usb_interface;
+    const char *    name;
+} corsair_hydro_device;
+
+#define CORSAIR_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ]))
+
+static const corsair_hydro_device device_list[] =
+{
+    /*-----------------------------------------------------------------------------------------------------*\
+    | Coolers                                                                                               |
+    \*-----------------------------------------------------------------------------------------------------*/
+    { CORSAIR_VID,          CORSAIR_H100I_PRO_RGB_PID,          0,      "Corsair H100i PRO RGB"             },
+    { CORSAIR_VID,          CORSAIR_H115I_PRO_RGB_PID,          0,      "Corsair H115i PRO RGB"             },
+    { CORSAIR_VID,          CORSAIR_H150I_PRO_RGB_PID,          0,      "Corsair H150i PRO RGB"             },
+};
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectCorsairHydroControllers                                                          *
+*                                                                                          *
+*       Tests the USB address to see if a Corsair RGB Cooler controller exists there.      *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectCorsairHydroControllers(std::vector<RGBController*>& rgb_controllers)
+{
+    libusb_context * ctx;
+    libusb_init(&ctx);
+
+    for(std::size_t device_idx = 0; device_idx < CORSAIR_NUM_DEVICES; device_idx++)
+    {
+        libusb_device_handle * dev = libusb_open_device_with_vid_pid(ctx, device_list[device_idx].usb_vid, device_list[device_idx].usb_pid);
+
+        //Look for Corsair RGB Peripheral
+        if(dev)
+        {
+            libusb_detach_kernel_driver(dev, 0);
+            libusb_claim_interface(dev, 0);
+
+            CorsairHydroController* controller = new CorsairHydroController(dev);//, device_list[device_idx].usb_endpoint);
+
+            RGBController_CorsairHydro* rgb_controller = new RGBController_CorsairHydro(controller);
+
+            rgb_controller->name = device_list[device_idx].name;
+            
+            rgb_controllers.push_back(rgb_controller);
+        }
+    }
+}   /* DetectCorsairHydroControllers() */
+
+REGISTER_DETECTOR("Corsair Hydro Series", DetectCorsairHydroControllers);
@@ -0,0 +1,136 @@
+/*-----------------------------------------*\
+|  RGBController_CorsairHydro.cpp           |
+|                                           |
+|  Generic RGB Interface for Corsair        |
+|  Hydro Series                             |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 8/18/2020   |
+\*-----------------------------------------*/
+
+#include "RGBController_CorsairHydro.h"
+
+RGBController_CorsairHydro::RGBController_CorsairHydro(CorsairHydroController* corsair_ptr)
+{
+    corsair = corsair_ptr;
+
+    description = "Corsair Hydro Series Device";
+    version     = corsair->GetFirmwareString();
+    type        = DEVICE_TYPE_COOLER;
+
+    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);
+
+    mode Blinking;
+    Blinking.name       = "Blinking";
+    Blinking.value      = 1;
+    Blinking.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR;
+    Blinking.color_mode = MODE_COLORS_MODE_SPECIFIC;
+    Blinking.speed_min  = 0x0F;
+    Blinking.speed_max  = 0x05;
+    Blinking.speed      = 0x0A;
+    Blinking.colors_min = 2;
+    Blinking.colors_max = 2;
+    Blinking.colors.resize(2);
+    modes.push_back(Blinking);
+
+    mode ColorShift;
+    ColorShift.name       = "Color Shift";
+    ColorShift.value      = 2;
+    ColorShift.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR;
+    ColorShift.color_mode = MODE_COLORS_MODE_SPECIFIC;
+    ColorShift.speed_min  = 0x46;
+    ColorShift.speed_max  = 0x0F;
+    ColorShift.speed      = 0x28;
+    ColorShift.colors_min = 2;
+    ColorShift.colors_max = 2;
+    ColorShift.colors.resize(2);
+    modes.push_back(ColorShift);
+
+    mode Pulsing;
+    Pulsing.name       = "Pulsing";
+    Pulsing.value      = 3;
+    Pulsing.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR;
+    Pulsing.color_mode = MODE_COLORS_MODE_SPECIFIC;
+    Pulsing.speed_min  = 0x50;
+    Pulsing.speed_max  = 0x1E;
+    Pulsing.speed      = 0x37;
+    Pulsing.colors_min = 2;
+    Pulsing.colors_max = 2;
+    Pulsing.colors.resize(2);
+    modes.push_back(Pulsing);
+
+    SetupZones();
+}
+
+void RGBController_CorsairHydro::SetupZones()
+{
+    zone new_zone;
+    
+    new_zone.name       = "Pump Zone";
+    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;
+    zones.push_back(new_zone);
+
+    led new_led;
+
+    new_led.name        = "Pump LED";
+    leds.push_back(new_led);
+
+    SetupColors();
+}
+
+void RGBController_CorsairHydro::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_CorsairHydro::DeviceUpdateLEDs()
+{
+    DeviceUpdateMode();
+}
+
+void RGBController_CorsairHydro::UpdateZoneLEDs(int /*zone*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_CorsairHydro::UpdateSingleLED(int /*led*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_CorsairHydro::SetCustomMode()
+{
+    active_mode = 0;
+}
+
+void RGBController_CorsairHydro::DeviceUpdateMode()
+{
+    switch(modes[active_mode].value)
+    {
+        case 0:
+            corsair->SetFixed(colors);
+            break;
+
+        case 1:
+            corsair->SetBlink(modes[active_mode].colors, modes[active_mode].speed);
+            break;
+
+        case 2:
+            corsair->SetShift(modes[active_mode].colors, modes[active_mode].speed);
+            break;
+
+        case 3:
+            corsair->SetPulse(modes[active_mode].colors, modes[active_mode].speed);
+            break;
+    }
+}
@@ -0,0 +1,32 @@
+/*-----------------------------------------*\
+|  RGBController_CorsairHydro.h             |
+|                                           |
+|  Generic RGB Interface for Corsair        |
+|  Hydro Series                             |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 8/17/2020   |
+\*-----------------------------------------*/
+
+#pragma once
+#include "RGBController.h"
+#include "CorsairHydroController.h"
+
+class RGBController_CorsairHydro : public RGBController
+{
+public:
+    RGBController_CorsairHydro(CorsairHydroController* corsair_ptr);
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        SetCustomMode();
+    void        DeviceUpdateMode();
+
+private:
+    CorsairHydroController*     corsair;
+};
@@ -37,9 +37,10 @@ THREAD keepalive_thread(void *param)
    THREADRETURN
 }

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

    SendFirmwareRequest();

@@ -65,7 +66,7 @@ void CorsairLightingNodeController::KeepaliveThread()
 {
    while(1)
    {
-        if((clock() - last_commit_time) > 5000)
+        if((std::chrono::steady_clock::now() - last_commit_time) > std::chrono::seconds(5))
        {
            SendCommit();
        }
@@ -78,6 +79,11 @@ std::string CorsairLightingNodeController::GetFirmwareString()
    return(firmware_version);
 }

+std::string CorsairLightingNodeController::GetLocationString()
+{
+    return(location);
+}
+
 void CorsairLightingNodeController::SetChannelEffect(unsigned char channel,
                                                unsigned char num_leds,
                                                unsigned char mode,
@@ -198,7 +204,7 @@ void CorsairLightingNodeController::SetChannelLEDs(unsigned char channel, RGBCol
 void CorsairLightingNodeController::SendFirmwareRequest()
 {
    int             actual;
-    unsigned char   usb_buf[64];
+    unsigned char   usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -208,13 +214,14 @@ void CorsairLightingNodeController::SendFirmwareRequest()
    /*-----------------------------------------------------*\
    | Set up Firmware Version Request packet                |
    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_LIGHTING_NODE_PACKET_ID_FIRMWARE;
+    usb_buf[0x00]   = 0x00;
+    usb_buf[0x01]   = CORSAIR_LIGHTING_NODE_PACKET_ID_FIRMWARE;

    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, usb_buf, 64);
-    actual = hid_read(dev, usb_buf, 16);
+    hid_write(dev, usb_buf, 65);
+    actual = hid_read(dev, usb_buf, 17);

    if(actual > 0)
    {
@@ -231,7 +238,7 @@ void CorsairLightingNodeController::SendDirect
    unsigned char*  color_data
    )
 {
-    unsigned char   usb_buf[64];
+    unsigned char   usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -241,27 +248,28 @@ void CorsairLightingNodeController::SendDirect
    /*-----------------------------------------------------*\
    | Set up Direct packet                                  |
    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_LIGHTING_NODE_PACKET_ID_DIRECT;
-    usb_buf[0x01]   = channel;
-    usb_buf[0x02]   = start;
-    usb_buf[0x03]   = count;
-    usb_buf[0x04]   = color_channel;
+    usb_buf[0x00]   = 0x00;
+    usb_buf[0x01]   = CORSAIR_LIGHTING_NODE_PACKET_ID_DIRECT;
+    usb_buf[0x02]   = channel;
+    usb_buf[0x03]   = start;
+    usb_buf[0x04]   = count;
+    usb_buf[0x05]   = color_channel;

    /*-----------------------------------------------------*\
    | Copy in color data bytes                              |
    \*-----------------------------------------------------*/
-    memcpy(&usb_buf[0x05], color_data, count);
+    memcpy(&usb_buf[0x06], color_data, count);

    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, usb_buf, 64);
-    hid_read(dev, usb_buf, 16);
+    hid_write(dev, usb_buf, 65);
+    hid_read(dev, usb_buf, 17);
 }

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

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -271,19 +279,20 @@ void CorsairLightingNodeController::SendCommit()
    /*-----------------------------------------------------*\
    | Update last commit time                               |
    \*-----------------------------------------------------*/
-    last_commit_time = clock();
+    last_commit_time = std::chrono::steady_clock::now();

    /*-----------------------------------------------------*\
    | Set up Commit packet                                  |
    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_LIGHTING_NODE_PACKET_ID_COMMIT;
-    usb_buf[0x01]   = 0xFF;
+    usb_buf[0x00]   = 0x00;
+    usb_buf[0x01]   = CORSAIR_LIGHTING_NODE_PACKET_ID_COMMIT;
+    usb_buf[0x02]   = 0xFF;

    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, usb_buf, 64);
-    hid_read(dev, usb_buf, 16);
+    hid_write(dev, usb_buf, 65);
+    hid_read(dev, usb_buf, 17);
 }

 void CorsairLightingNodeController::SendBegin
@@ -291,7 +300,7 @@ void CorsairLightingNodeController::SendBegin
    unsigned char   channel
    )
 {
-    unsigned char   usb_buf[64];
+    unsigned char   usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -301,14 +310,15 @@ void CorsairLightingNodeController::SendBegin
    /*-----------------------------------------------------*\
    | Set up Begin packet                                   |
    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_LIGHTING_NODE_PACKET_ID_BEGIN;
-    usb_buf[0x01]   = channel;
+    usb_buf[0x00]   = 0x00;
+    usb_buf[0x01]   = CORSAIR_LIGHTING_NODE_PACKET_ID_BEGIN;
+    usb_buf[0x02]   = channel;

    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, usb_buf, 64);
-    hid_read(dev, usb_buf, 16);
+    hid_write(dev, usb_buf, 65);
+    hid_read(dev, usb_buf, 17);
 }

 void CorsairLightingNodeController::SendEffectConfig
@@ -334,7 +344,7 @@ void CorsairLightingNodeController::SendEffectConfig
    unsigned short  temperature_2
    )
 {
-    unsigned char   usb_buf[64];
+    unsigned char   usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -344,48 +354,49 @@ void CorsairLightingNodeController::SendEffectConfig
    /*-----------------------------------------------------*\
    | Set up Effect Config packet                           |
    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_LIGHTING_NODE_PACKET_ID_EFFECT_CONFIG;
-    usb_buf[0x01]   = channel;
-    usb_buf[0x02]   = count;
-    usb_buf[0x03]   = led_type;
+    usb_buf[0x00]   = 0x00;
+    usb_buf[0x01]   = CORSAIR_LIGHTING_NODE_PACKET_ID_EFFECT_CONFIG;
+    usb_buf[0x02]   = channel;
+    usb_buf[0x03]   = count;
+    usb_buf[0x04]   = led_type;

    /*-----------------------------------------------------*\
    | Set up mode parameters                                |
    \*-----------------------------------------------------*/
-    usb_buf[0x04]   = mode;
-    usb_buf[0x05]   = speed;
-    usb_buf[0x06]   = direction;
-    usb_buf[0x07]   = change_style;
-    usb_buf[0x08]   = 0;
+    usb_buf[0x05]   = mode;
+    usb_buf[0x06]   = speed;
+    usb_buf[0x07]   = direction;
+    usb_buf[0x08]   = change_style;
+    usb_buf[0x09]   = 0;

    /*-----------------------------------------------------*\
    | Set up mode colors                                    |
    \*-----------------------------------------------------*/
-    usb_buf[0x09]   = color_0_red;
-    usb_buf[0x0A]   = color_0_green;
-    usb_buf[0x0B]   = color_0_blue;
-    usb_buf[0x0C]   = color_1_red;
-    usb_buf[0x0D]   = color_1_green;
-    usb_buf[0x0E]   = color_1_blue;
-    usb_buf[0x0F]   = color_2_red;
-    usb_buf[0x10]   = color_2_green;
-    usb_buf[0x11]   = color_2_blue;
+    usb_buf[0x0A]   = color_0_red;
+    usb_buf[0x0B]   = color_0_green;
+    usb_buf[0x0C]   = color_0_blue;
+    usb_buf[0x0D]   = color_1_red;
+    usb_buf[0x0E]   = color_1_green;
+    usb_buf[0x0F]   = color_1_blue;
+    usb_buf[0x10]   = color_2_red;
+    usb_buf[0x11]   = color_2_green;
+    usb_buf[0x12]   = color_2_blue;

    /*-----------------------------------------------------*\
    | Set up temperatures                                   |
    \*-----------------------------------------------------*/
-    usb_buf[0x12]   = (temperature_0 >> 8);
-    usb_buf[0x13]   = (temperature_0 & 0xFF);
-    usb_buf[0x14]   = (temperature_1 >> 8);
-    usb_buf[0x15]   = (temperature_1 & 0xFF);
-    usb_buf[0x16]   = (temperature_2 >> 8);
-    usb_buf[0x17]   = (temperature_2 & 0xFF);
+    usb_buf[0x13]   = (temperature_0 >> 8);
+    usb_buf[0x14]   = (temperature_0 & 0xFF);
+    usb_buf[0x15]   = (temperature_1 >> 8);
+    usb_buf[0x16]   = (temperature_1 & 0xFF);
+    usb_buf[0x17]   = (temperature_2 >> 8);
+    usb_buf[0x18]   = (temperature_2 & 0xFF);

    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, usb_buf, 64);
-    hid_read(dev, usb_buf, 16);
+    hid_write(dev, usb_buf, 65);
+    hid_read(dev, usb_buf, 17);
 }

 void CorsairLightingNodeController::SendTemperature()
@@ -398,7 +409,7 @@ void CorsairLightingNodeController::SendReset
    unsigned char   channel
    )
 {
-    unsigned char   usb_buf[64];
+    unsigned char   usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -408,14 +419,15 @@ void CorsairLightingNodeController::SendReset
    /*-----------------------------------------------------*\
    | Set up Reset packet                                   |
    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_LIGHTING_NODE_PACKET_ID_RESET;
-    usb_buf[0x01]   = channel;
+    usb_buf[0x00]   = 0x00;
+    usb_buf[0x01]   = CORSAIR_LIGHTING_NODE_PACKET_ID_RESET;
+    usb_buf[0x02]   = channel;

    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, usb_buf, 64);
-    hid_read(dev, usb_buf, 16);
+    hid_write(dev, usb_buf, 65);
+    hid_read(dev, usb_buf, 17);
 }

 void CorsairLightingNodeController::SendPortState
@@ -424,7 +436,7 @@ void CorsairLightingNodeController::SendPortState
    unsigned char   state
    )
 {
-    unsigned char   usb_buf[64];
+    unsigned char   usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -434,15 +446,16 @@ void CorsairLightingNodeController::SendPortState
    /*-----------------------------------------------------*\
    | Set up Port State packet                              |
    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_LIGHTING_NODE_PACKET_ID_PORT_STATE;
-    usb_buf[0x01]   = channel;
-    usb_buf[0x02]   = state;
+    usb_buf[0x00]   = 0x00;
+    usb_buf[0x01]   = CORSAIR_LIGHTING_NODE_PACKET_ID_PORT_STATE;
+    usb_buf[0x02]   = channel;
+    usb_buf[0x03]   = state;

    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, usb_buf, 64);
-    hid_read(dev, usb_buf, 16);
+    hid_write(dev, usb_buf, 65);
+    hid_read(dev, usb_buf, 17);
 }

 void CorsairLightingNodeController::SendBrightness()
@@ -5,6 +5,7 @@
 \*---------------------------------------------------------*/

 #include "RGBController.h"
+#include <chrono>
 #include <vector>
 #include <hidapi/hidapi.h>

@@ -78,10 +79,11 @@ enum
 class CorsairLightingNodeController
 {
 public:
-    CorsairLightingNodeController(hid_device* dev_handle);
+    CorsairLightingNodeController(hid_device* dev_handle, const char* path);
    ~CorsairLightingNodeController();

    std::string     GetFirmwareString();
+    std::string     GetLocationString();

    unsigned int    GetStripsOnChannel(unsigned int channel);

@@ -109,7 +111,8 @@ public:
 private:
    hid_device*             dev;
    std::string             firmware_version;
-    clock_t                 last_commit_time;
+    std::string             location;
+    std::chrono::time_point<std::chrono::steady_clock> last_commit_time;

    void            SendFirmwareRequest();

@@ -1,3 +1,4 @@
+#include "Detector.h"
 #include "CorsairLightingNodeController.h"
 #include "RGBController.h"
 #include "RGBController_CorsairLightingNode.h"
@@ -63,7 +64,7 @@ void DetectCorsairLightingNodeControllers(std::vector<RGBController*> &rgb_contr

                if( dev )
                {
-                    CorsairLightingNodeController* controller = new CorsairLightingNodeController(dev);
+                    CorsairLightingNodeController* controller = new CorsairLightingNodeController(dev, info->path);

                    RGBController_CorsairLightingNode* rgb_controller = new RGBController_CorsairLightingNode(controller);

@@ -77,3 +78,5 @@ void DetectCorsairLightingNodeControllers(std::vector<RGBController*> &rgb_contr
        }
    }
 }   /* DetectCorsairLightingNodeControllers() */
+
+REGISTER_DETECTOR("Corsair Lighting Node", DetectCorsairLightingNodeControllers);
@@ -18,6 +18,7 @@ RGBController_CorsairLightingNode::RGBController_CorsairLightingNode(CorsairLigh
    description = "Corsair Lighting Node Device";
    type        = DEVICE_TYPE_LEDSTRIP;
    version     = corsair->GetFirmwareString();
+    location    = corsair->GetLocationString();

    mode Direct;
    Direct.name       = "Direct";
@@ -201,7 +202,7 @@ void RGBController_CorsairLightingNode::SetupZones()
        | can support is 200.                               |
        \*-------------------------------------------------*/
        zones[channel_idx].leds_min   = 0;
-        zones[channel_idx].leds_max   = 200;
+        zones[channel_idx].leds_max   = 204;

        if(first_run)
        {
@@ -231,6 +232,11 @@ void RGBController_CorsairLightingNode::SetupZones()

 void RGBController_CorsairLightingNode::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;
@@ -264,7 +270,7 @@ void RGBController_CorsairLightingNode::SetCustomMode()
    active_mode = 0;
 }

-void RGBController_CorsairLightingNode::UpdateMode()
+void RGBController_CorsairLightingNode::DeviceUpdateMode()
 {
    if(modes[active_mode].value == 0xFFFF)
    {
@@ -25,7 +25,7 @@ public:
    void        UpdateSingleLED(int led);

    void        SetCustomMode();
-    void        UpdateMode();
+    void        DeviceUpdateMode();

 private:
    CorsairLightingNodeController*   corsair;
@@ -22,29 +22,39 @@ static unsigned int keys[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x
                              116,  117,  120,  121,  122,  123,  124,  126,  127,  128,  129,  132,  133,  134,  135,
                              136,  137,  139,  140,  141};

+
+static unsigned int keys_k95_plat[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0C, 0x0D, 0x0E, 0x0F, 0x11, 0x12,
+                                       0x14, 0x15, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x24, 0x25, 0x26,
+                                       0x27, 0x28, 0x2A, 0x2B, 0x2C, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+                                       0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x42, 0x43, 0x44, 0x45, 0x48, 73,   74,   75,   76,   78,
+                                       79,   80,   81,   84,   85,   86,   87,   88,   89,   90,   91,   92,   93,   96,   97,
+                                       98,   99,   100,  101,  102,  103,  104,  105,  108,  109,  110,  111,  112,  113,  115,
+                                       116,  117,  120,  121,  122,  123,  124,  126,  127,  128,  129,  132,  133,  134,  135,
+                                       136,  137,  139,  140,  141,
+                                       0x10, 114, 0x0a, 0x16, 0x22, 0x2e, 0x3a, 0x46,
+                                       144,  145,  146,  158,  160,  147,  148,  149,  150,  151,  152,  153,
+                                       154,  155,  159,  162,  161,  156,  157};
+
+static unsigned int keys_k95[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0C, 0x0D, 0x0E, 0x0F, 0x11, 0x12,
+                                  0x14, 0x15, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x24, 0x25, 0x26,
+                                  0x27, 0x28, 0x2A, 0x2B, 0x2C, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+                                  0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x42, 0x43, 0x44, 0x45, 0x48, 73,   74,   75,   76,   78,
+                                  79,   80,   81,   84,   85,   86,   87,   88,   89,   90,   91,   92,   93,   96,   97,
+                                  98,   99,   100,  101,  102,  103,  104,  105,  108,  109,  110,  111,  112,  113,  115,
+                                  116,  117,  120,  121,  122,  123,  124,  126,  127,  128,  129,  132,  133,  134,  135,
+                                  136,  137,  139,  140,  141,
+                                  0x10, 114, 0x0a, 0x16, 0x22, 0x2e, 0x3a, 0x46, 0x52, 0x5e, 0x6a, 0x76, 0x3b, 0x47, 0x53,
+                                  0x5f, 0x6b, 0x77, 0x83, 0x8f, 0x0b, 0x17, 0x23, 0x2f};
+
 static unsigned int st100[] = { 0x00, 0x01, 0x02, 0x03, 0x05, 0x06, 0x07, 0x08, 0x04 };

-static void send_usb_msg(hid_device* dev, char * data_pkt)
+CorsairPeripheralController::CorsairPeripheralController(hid_device* dev_handle, const char* path)
 {
-    char usb_pkt[65];
-    usb_pkt[0] = 0x00;
-    for(int i = 1; i < 65; i++)
-    {
-        usb_pkt[i] = data_pkt[i-1];
-    }
-    int bytes = hid_send_feature_report(dev, (unsigned char *)usb_pkt, 65);
-    bytes++;
-
-    std::this_thread::sleep_for(1ms);
-}
-
-CorsairPeripheralController::CorsairPeripheralController(hid_device* dev_handle)
-{
-    dev = dev_handle;
+    dev         = dev_handle;
+    location    = path;

    ReadFirmwareInfo();

-    SpecialFunctionControl();
    LightingControl();
 }

@@ -58,6 +68,21 @@ device_type CorsairPeripheralController::GetDeviceType()
    return type;
 }

+std::string CorsairPeripheralController::GetDeviceLocation()
+{
+    return(location);
+}
+
+int CorsairPeripheralController::GetPhysicalLayout()
+{
+    return physical_layout;
+}
+
+int CorsairPeripheralController::GetLogicalLayout()
+{
+    return logical_layout;
+}
+
 std::string CorsairPeripheralController::GetFirmwareString()
 {
    return firmware_version;
@@ -103,9 +128,9 @@ void CorsairPeripheralController::SetLEDs(std::vector<RGBColor>colors)

 void CorsairPeripheralController::SetLEDsKeyboardFull(std::vector<RGBColor> colors)
 {
-    unsigned char red_val[144];
-    unsigned char grn_val[144];
-    unsigned char blu_val[144];
+    unsigned char red_val[168];
+    unsigned char grn_val[168];
+    unsigned char blu_val[168];

    /*-----------------------------------------------------*\
    | Zero out buffers                                      |
@@ -120,9 +145,24 @@ void CorsairPeripheralController::SetLEDsKeyboardFull(std::vector<RGBColor> colo
    for(std::size_t color_idx = 0; color_idx < colors.size(); color_idx++)
    {
        RGBColor           color = colors[color_idx];
-        red_val[keys[color_idx]] = RGBGetRValue(color);
-        grn_val[keys[color_idx]] = RGBGetGValue(color);
-        blu_val[keys[color_idx]] = RGBGetBValue(color);
+        if (logical_layout == CORSAIR_TYPE_K95_PLAT)
+        {
+            red_val[keys_k95_plat[color_idx]] = RGBGetRValue(color);
+            grn_val[keys_k95_plat[color_idx]] = RGBGetGValue(color);
+            blu_val[keys_k95_plat[color_idx]] = RGBGetBValue(color);
+        }
+        else if (logical_layout == CORSAIR_TYPE_K95)
+        {
+            red_val[keys_k95[color_idx]] = RGBGetRValue(color);
+            grn_val[keys_k95[color_idx]] = RGBGetGValue(color);
+            blu_val[keys_k95[color_idx]] = RGBGetBValue(color);
+        }
+        else
+        {
+            red_val[keys[color_idx]] = RGBGetRValue(color);
+            grn_val[keys[color_idx]] = RGBGetGValue(color);
+            blu_val[keys[color_idx]] = RGBGetBValue(color);
+        }
    }

    /*-----------------------------------------------------*\
@@ -130,7 +170,7 @@ void CorsairPeripheralController::SetLEDsKeyboardFull(std::vector<RGBColor> colo
    \*-----------------------------------------------------*/
    StreamPacket(1, 60, &red_val[0]);
    StreamPacket(2, 60, &red_val[60]);
-    StreamPacket(3, 24, &red_val[120]);
+    StreamPacket(3, 48, &red_val[120]);
    SubmitKeyboardFullColors(1, 3, 1);

    /*-----------------------------------------------------*\
@@ -138,7 +178,7 @@ void CorsairPeripheralController::SetLEDsKeyboardFull(std::vector<RGBColor> colo
    \*-----------------------------------------------------*/
    StreamPacket(1, 60, &grn_val[0]);
    StreamPacket(2, 60, &grn_val[60]);
-    StreamPacket(3, 24, &grn_val[120]);
+    StreamPacket(3, 48, &grn_val[120]);
    SubmitKeyboardFullColors(2, 3, 1);

    /*-----------------------------------------------------*\
@@ -146,7 +186,7 @@ void CorsairPeripheralController::SetLEDsKeyboardFull(std::vector<RGBColor> colo
    \*-----------------------------------------------------*/
    StreamPacket(1, 60, &blu_val[0]);
    StreamPacket(2, 60, &blu_val[60]);
-    StreamPacket(3, 24, &blu_val[120]);
+    StreamPacket(3, 48, &blu_val[120]);
    SubmitKeyboardFullColors(3, 3, 2);
 }

@@ -233,7 +273,7 @@ void CorsairPeripheralController::SetLEDsKeyboardLimited(std::vector<RGBColor> c

 void CorsairPeripheralController::LightingControl()
 {
-    char usb_buf[64];
+    char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -243,9 +283,10 @@ void CorsairPeripheralController::LightingControl()
    /*-----------------------------------------------------*\
    | Set up Lighting Control packet                        |
    \*-----------------------------------------------------*/
-    usb_buf[0x00]           = CORSAIR_COMMAND_WRITE;
-    usb_buf[0x01]           = CORSAIR_PROPERTY_LIGHTING_CONTROL;
-    usb_buf[0x02]           = CORSAIR_LIGHTING_CONTROL_SOFTWARE;
+    usb_buf[0x00]           = 0x00;
+    usb_buf[0x01]           = CORSAIR_COMMAND_WRITE;
+    usb_buf[0x02]           = CORSAIR_PROPERTY_LIGHTING_CONTROL;
+    usb_buf[0x03]           = CORSAIR_LIGHTING_CONTROL_SOFTWARE;

    /*-----------------------------------------------------*\
    | Lighting control byte needs to be 3 for keyboards and |
@@ -255,31 +296,31 @@ void CorsairPeripheralController::LightingControl()
    {
        default:
        case DEVICE_TYPE_KEYBOARD:
-            usb_buf[0x04]   = 0x03;
+            usb_buf[0x05]   = 0x03;
            break;

        case DEVICE_TYPE_MOUSE:
-            usb_buf[0x04]   = 0x01;
+            usb_buf[0x05]   = 0x01;
            break;

        case DEVICE_TYPE_MOUSEMAT:
-            usb_buf[0x04]   = 0x04;
+            usb_buf[0x05]   = 0x04;
            break;

        case DEVICE_TYPE_HEADSET_STAND:
-            usb_buf[0x04]   = 0x03;
+            usb_buf[0x05]   = 0x03;
            break;
    }
    
    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    send_usb_msg(dev, usb_buf);
+    hid_write(dev, (unsigned char *)usb_buf, 65);
 }

 void CorsairPeripheralController::SpecialFunctionControl()
 {
-    char usb_buf[64];
+    char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -289,20 +330,23 @@ void CorsairPeripheralController::SpecialFunctionControl()
    /*-----------------------------------------------------*\
    | Set up Lighting Control packet                        |
    \*-----------------------------------------------------*/
-    usb_buf[0x00]           = CORSAIR_COMMAND_WRITE;
-    usb_buf[0x01]           = CORSAIR_PROPERTY_SPECIAL_FUNCTION;
-    usb_buf[0x02]           = CORSAIR_LIGHTING_CONTROL_SOFTWARE;
+    usb_buf[0x00]           = 0x00;
+    usb_buf[0x01]           = CORSAIR_COMMAND_WRITE;
+    usb_buf[0x02]           = CORSAIR_PROPERTY_SPECIAL_FUNCTION;
+    usb_buf[0x03]           = CORSAIR_LIGHTING_CONTROL_SOFTWARE;
    
    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    send_usb_msg(dev, usb_buf);
+    hid_write(dev, (unsigned char *)usb_buf, 65);
 }

+
 void CorsairPeripheralController::ReadFirmwareInfo()
 {
    int  actual;
-    char usb_buf[64];
+    char usb_buf[65];
+    char offset = 0;

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -312,16 +356,17 @@ void CorsairPeripheralController::ReadFirmwareInfo()
    /*-----------------------------------------------------*\
    | Set up Read Firmware Info packet                      |
    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_COMMAND_READ;
-    usb_buf[0x01]   = CORSAIR_PROPERTY_FIRMWARE_INFO;
+    usb_buf[0x00]   = 0x00;
+    usb_buf[0x01]   = CORSAIR_COMMAND_READ;
+    usb_buf[0x02]   = CORSAIR_PROPERTY_FIRMWARE_INFO;

    /*-----------------------------------------------------*\
    | Send packet and try reading it using an HID read      |
    | If that fails, repeat the send and read the reply as  |
    | a feature report.                                     |
    \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char*)usb_buf, 64);
-    actual = hid_read_timeout(dev, (unsigned char*)usb_buf, 64, 1000);
+    hid_write(dev, (unsigned char*)usb_buf, 65);
+    actual = hid_read_timeout(dev, (unsigned char*)usb_buf, 65, 1000);

    if(actual == 0)
    {
@@ -333,11 +378,13 @@ void CorsairPeripheralController::ReadFirmwareInfo()
        /*-------------------------------------------------*\
        | Set up Read Firmware Info packet                  |
        \*-------------------------------------------------*/
-        usb_buf[0x00]   = CORSAIR_COMMAND_READ;
-        usb_buf[0x01]   = CORSAIR_PROPERTY_FIRMWARE_INFO;
+        usb_buf[0x00]   = 0x00;
+        usb_buf[0x01]   = CORSAIR_COMMAND_READ;
+        usb_buf[0x02]   = CORSAIR_PROPERTY_FIRMWARE_INFO;

-        hid_write(dev, (unsigned char*)usb_buf, 64);
-        actual = hid_get_feature_report(dev, (unsigned char*)usb_buf, 64);
+        hid_send_feature_report(dev, (unsigned char*)usb_buf, 65);
+        actual = hid_get_feature_report(dev, (unsigned char*)usb_buf, 65);
+        offset = 1;
    }

    /*-----------------------------------------------------*\
@@ -346,14 +393,32 @@ void CorsairPeripheralController::ReadFirmwareInfo()
    |   0xC1    Device is a mouse                           |
    |   0xC2    Device is a mousepad or headset stand       |
    \*-----------------------------------------------------*/
-    switch((unsigned char)usb_buf[0x14])
+    switch((unsigned char)usb_buf[0x14 + offset])
    {
        case 0xC0:
+            {
+                unsigned short pid = (unsigned short)(usb_buf[0x0F] << 8) + (unsigned char)(usb_buf[0x0E]);
+
+                switch(pid)
+                {
+                    case 0x2D1B:
+                    logical_layout = CORSAIR_TYPE_K95_PLAT;
+                    break;
+
+                    case 0x1B11:
+                    logical_layout = CORSAIR_TYPE_K95;
+                    break;
+
+                    default:
+                    logical_layout = CORSAIR_TYPE_NORMAL;
+                }
+            }
            type = DEVICE_TYPE_KEYBOARD;
            break;

        case 0xC1:
            type = DEVICE_TYPE_MOUSE;
+            SpecialFunctionControl();
            break;

        case 0xC2:
@@ -364,10 +429,12 @@ void CorsairPeripheralController::ReadFirmwareInfo()
                {
                    case 0x0A34:
                        type = DEVICE_TYPE_HEADSET_STAND;
+                        SpecialFunctionControl();
                        break;
                    
                    default:
                        type = DEVICE_TYPE_MOUSEMAT;
+                        SpecialFunctionControl();
                        break;
                }
            }
@@ -383,7 +450,22 @@ void CorsairPeripheralController::ReadFirmwareInfo()
    \*-----------------------------------------------------*/
    if(type != DEVICE_TYPE_UNKNOWN)
    {
-        firmware_version = std::to_string(usb_buf[0x09]) + "." + std::to_string(usb_buf[0x08]);
+        firmware_version = std::to_string(usb_buf[0x09 + offset]) + "." + std::to_string(usb_buf[0x08 + offset]);
+    }
+
+    /*-----------------------------------------------------*\
+    | Get the correct Keyboard Layout                       |
+    \*-----------------------------------------------------*/
+    switch((unsigned char)usb_buf[0x17 + offset])
+    {
+        case CORSAIR_LAYOUT_ANSI:
+            physical_layout = CORSAIR_LAYOUT_ANSI;
+            break;
+        case CORSAIR_LAYOUT_ISO:
+            physical_layout = CORSAIR_LAYOUT_ISO;
+            break;
+        default:
+            physical_layout = CORSAIR_LAYOUT_ANSI;
    }
 }

@@ -394,7 +476,7 @@ void CorsairPeripheralController::StreamPacket
    unsigned char*  data_ptr
    )
 {
-    char usb_buf[64];
+    char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -404,19 +486,20 @@ void CorsairPeripheralController::StreamPacket
    /*-----------------------------------------------------*\
    | Set up Stream packet                                  |
    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_COMMAND_STREAM;
-    usb_buf[0x01]   = packet_id;
-    usb_buf[0x02]   = data_sz;
+    usb_buf[0x00]   = 0x00;
+    usb_buf[0x01]   = CORSAIR_COMMAND_STREAM;
+    usb_buf[0x02]   = packet_id;
+    usb_buf[0x03]   = data_sz;

    /*-----------------------------------------------------*\
    | Copy in data bytes                                    |
    \*-----------------------------------------------------*/
-    memcpy(&usb_buf[0x04], data_ptr, data_sz);
+    memcpy(&usb_buf[0x05], data_ptr, data_sz);

    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 64);
+    hid_write(dev, (unsigned char *)usb_buf, 65);
 }

 void CorsairPeripheralController::SubmitKeyboardFullColors
@@ -426,7 +509,7 @@ void CorsairPeripheralController::SubmitKeyboardFullColors
    unsigned char   finish_val
    )
 {
-    char usb_buf[64];
+    char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -436,16 +519,17 @@ void CorsairPeripheralController::SubmitKeyboardFullColors
    /*-----------------------------------------------------*\
    | Set up Submit Keyboard 24-Bit Colors packet           |
    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_COMMAND_WRITE;
-    usb_buf[0x01]   = CORSAIR_PROPERTY_SUBMIT_KEYBOARD_COLOR_24;
-    usb_buf[0x02]   = color_channel;
-    usb_buf[0x03]   = packet_count;
-    usb_buf[0x04]   = finish_val;
+    usb_buf[0x00]   = 0x00;
+    usb_buf[0x01]   = CORSAIR_COMMAND_WRITE;
+    usb_buf[0x02]   = CORSAIR_PROPERTY_SUBMIT_KEYBOARD_COLOR_24;
+    usb_buf[0x03]   = color_channel;
+    usb_buf[0x04]   = packet_count;
+    usb_buf[0x05]   = finish_val;

    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 64);
+    hid_write(dev, (unsigned char *)usb_buf, 65);
 }

 void CorsairPeripheralController::SubmitKeyboardLimitedColors
@@ -453,7 +537,7 @@ void CorsairPeripheralController::SubmitKeyboardLimitedColors
    unsigned char   byte_count
    )
 {
-    char usb_buf[64];
+    char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -463,14 +547,15 @@ void CorsairPeripheralController::SubmitKeyboardLimitedColors
    /*-----------------------------------------------------*\
    | Set up Submit Keyboard 9-Bit Colors packet            |
    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_COMMAND_WRITE;
-    usb_buf[0x01]   = CORSAIR_PROPERTY_SUBMIT_KEYBOARD_COLOR_9;
-    usb_buf[0x04]   = byte_count;
+    usb_buf[0x00]   = 0x00;
+    usb_buf[0x01]   = CORSAIR_COMMAND_WRITE;
+    usb_buf[0x02]   = CORSAIR_PROPERTY_SUBMIT_KEYBOARD_COLOR_9;
+    usb_buf[0x05]   = byte_count;

    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 64);
+    hid_write(dev, (unsigned char *)usb_buf, 65);
 }

 void CorsairPeripheralController::SubmitMouseColors
@@ -479,7 +564,7 @@ void CorsairPeripheralController::SubmitMouseColors
    RGBColor *      color_data
    )
 {
-    char usb_buf[64];
+    char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -489,26 +574,27 @@ void CorsairPeripheralController::SubmitMouseColors
    /*-----------------------------------------------------*\
    | Set up Submit Mouse Colors packet                     |
    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_COMMAND_WRITE;
-    usb_buf[0x01]   = CORSAIR_PROPERTY_SUBMIT_MOUSE_COLOR;
-    usb_buf[0x02]   = num_zones;
-    usb_buf[0x03]   = 0x00;
+    usb_buf[0x00]   = 0x00;
+    usb_buf[0x01]   = CORSAIR_COMMAND_WRITE;
+    usb_buf[0x02]   = CORSAIR_PROPERTY_SUBMIT_MOUSE_COLOR;
+    usb_buf[0x03]   = num_zones;
+    usb_buf[0x04]   = 0x00;

    /*-----------------------------------------------------*\
    | Copy in colors in <ZONE> <RED> <GREEN> <BLUE> order   |
    \*-----------------------------------------------------*/
    for(unsigned int zone_idx = 0; zone_idx < num_zones; zone_idx++)
    {
-        usb_buf[(zone_idx * 4) + 4] = zone_idx;
-        usb_buf[(zone_idx * 4) + 5] = RGBGetRValue(color_data[zone_idx]);
-        usb_buf[(zone_idx * 4) + 6] = RGBGetGValue(color_data[zone_idx]);
-        usb_buf[(zone_idx * 4) + 7] = RGBGetBValue(color_data[zone_idx]);
+        usb_buf[(zone_idx * 4) + 5] = zone_idx;
+        usb_buf[(zone_idx * 4) + 6] = RGBGetRValue(color_data[zone_idx]);
+        usb_buf[(zone_idx * 4) + 7] = RGBGetGValue(color_data[zone_idx]);
+        usb_buf[(zone_idx * 4) + 8] = RGBGetBValue(color_data[zone_idx]);
    }

    /*-----------------------------------------------------*\
    | Send packet                                           |
    \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 64);
+    hid_write(dev, (unsigned char *)usb_buf, 65);
 }

 void CorsairPeripheralController::SubmitMousematColors
@@ -517,7 +603,7 @@ void CorsairPeripheralController::SubmitMousematColors
    RGBColor *      color_data
    )
 {
-    char usb_buf[64];
+    char usb_buf[65];

    /*-----------------------------------------------------*\
    | Zero out buffer                                       |
@@ -527,24 +613,25 @@ void CorsairPeripheralController::SubmitMousematColors
    /*-----------------------------------------------------*\
    | Set up Submit Mouse Colors packet                     |
    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_COMMAND_WRITE;
-    usb_buf[0x01]   = CORSAIR_PROPERTY_SUBMIT_MOUSE_COLOR;
-    usb_buf[0x02]   = num_zones;
-    usb_buf[0x03]   = 0x00;
+    usb_buf[0x00]   = 0x00;
+    usb_buf[0x01]   = CORSAIR_COMMAND_WRITE;
+    usb_buf[0x02]   = CORSAIR_PROPERTY_SUBMIT_MOUSE_COLOR;
+    usb_buf[0x03]   = num_zones;
+    usb_buf[0x04]   = 0x00;

    /*-----------------------------------------------------*\
    | Copy in colors in <RED> <GREEN> <BLUE> order          |
    \*-----------------------------------------------------*/
    for(unsigned int zone_idx = 0; zone_idx < num_zones; zone_idx++)
    {
-        usb_buf[(zone_idx * 3) + 4] = RGBGetRValue(color_data[zone_idx]);
-        usb_buf[(zone_idx * 3) + 5] = RGBGetGValue(color_data[zone_idx]);
-        usb_buf[(zone_idx * 3) + 6] = RGBGetBValue(color_data[zone_idx]);
+        usb_buf[(zone_idx * 3) + 5] = RGBGetRValue(color_data[zone_idx]);
+        usb_buf[(zone_idx * 3) + 6] = RGBGetGValue(color_data[zone_idx]);
+        usb_buf[(zone_idx * 3) + 7] = RGBGetBValue(color_data[zone_idx]);
    }

    /*-----------------------------------------------------*\
    | Send packet using feature reports, as headset stand   |
    | seems to not update completely using HID writes       |
    \*-----------------------------------------------------*/
-    send_usb_msg(dev, usb_buf);
+    hid_write(dev, (unsigned char *)usb_buf, 65);
 }
@@ -47,13 +47,32 @@ enum
    CORSAIR_COLOR_CHANNEL_BLUE      = 0x03
 };

+enum
+{
+    CORSAIR_LAYOUT_ANSI             = 0x00,
+    CORSAIR_LAYOUT_ISO              = 0x01,
+    CORSAIR_LAYOUT_ABNT             = 0x02,
+    CORSAIR_LAYOUT_JIS              = 0x03,
+    CORSAIR_LAYOUT_DUBEOLSIK        = 0x04
+};
+
+enum
+{
+    CORSAIR_TYPE_NORMAL             = 0,
+    CORSAIR_TYPE_K95_PLAT           = 1,
+    CORSAIR_TYPE_K95                = 2
+};
+
 class CorsairPeripheralController
 {
 public:
-    CorsairPeripheralController(hid_device* dev_handle);
+    CorsairPeripheralController(hid_device* dev_handle, const char* path);
    ~CorsairPeripheralController();

+    int             GetLogicalLayout();
+    int             GetPhysicalLayout();
    device_type     GetDeviceType();
+    std::string     GetDeviceLocation();
    std::string     GetFirmwareString();

    void            SetLEDs(std::vector<RGBColor> colors);
@@ -66,7 +85,10 @@ private:
    hid_device*             dev;

    std::string             firmware_version;
+    std::string             location;
    device_type             type;
+    int                     physical_layout;   //ANSI, ISO, etc.
+    int                     logical_layout;    //Normal, K95 or K95 Platinum

    void    LightingControl();
    void    SpecialFunctionControl();
@@ -1,3 +1,4 @@
+#include "Detector.h"
 #include "CorsairPeripheralController.h"
 #include "RGBController.h"
 #include "RGBController_CorsairPeripheral.h"
@@ -39,8 +40,13 @@
 | Mouse product IDs                                     |
 |   List taken from ckb-next                            |
 \*-----------------------------------------------------*/
+#define CORSAIR_GLAIVE_RGB_PRO_PID      0x1B74
+#define CORSAIR_HARPOON_RGB_PID         0x1B3C
+#define CORSAIR_HARPOON_RGB_PRO_PID     0x1B75
 #define CORSAIR_M65_PRO_PID             0x1B2E
 #define CORSAIR_M65_RGB_ELITE_PID       0x1B5A
+#define CORSAIR_SCIMITAR_PRO_RGB_PID    0x1B3E
+#define CORSAIR_SABRE_RGB_PID           0x1B2F

 /*-----------------------------------------------------*\
 | Mousepad product IDs                                  |
@@ -87,8 +93,13 @@ static const corsair_node_device device_list[] =
    /*-----------------------------------------------------------------------------------------------------*\
    | Mice                                                                                                  |
    \*-----------------------------------------------------------------------------------------------------*/
+    { CORSAIR_VID,          CORSAIR_GLAIVE_RGB_PRO_PID,         1,      "Corsair Glaive RGB PRO"            },
+    { CORSAIR_VID,          CORSAIR_HARPOON_RGB_PID,            1,      "Corsair Harpoon RGB"               },
+    { CORSAIR_VID,          CORSAIR_HARPOON_RGB_PRO_PID,        1,      "Corsair Harpoon RGB PRO"           },
    { CORSAIR_VID,          CORSAIR_M65_PRO_PID,                1,      "Corsair M65 PRO"                   },
    { CORSAIR_VID,          CORSAIR_M65_RGB_ELITE_PID,          1,      "Corsair M65 RGB Elite"             },
+    { CORSAIR_VID,          CORSAIR_SCIMITAR_PRO_RGB_PID,       1,      "Corsair Scimitar PRO RGB"          },
+    { CORSAIR_VID,          CORSAIR_SABRE_RGB_PID,              1,      "Corsair Sabre RGB"                 },
    /*-----------------------------------------------------------------------------------------------------*\
    | Mousemats                                                                                             |
    \*-----------------------------------------------------------------------------------------------------*/
@@ -124,30 +135,33 @@ void DetectCorsairPeripheralControllers(std::vector<RGBController*>& rgb_control
        while(info)
        {
            if((info->vendor_id == device_list[device_idx].usb_vid)
+#ifdef USE_HID_USAGE
+            &&(info->product_id == device_list[device_idx].usb_pid)
+            &&(info->usage_page == 0xFFC2))
+#else
            &&(info->product_id == device_list[device_idx].usb_pid)
            &&(info->interface_number == device_list[device_idx].usb_interface))
+#endif
            {
                dev = hid_open_path(info->path);
-                break;
-            }
-            else
-            {
-                info = info->next;
-            }
-        }

-        if( dev )
-        {
-            CorsairPeripheralController* controller = new CorsairPeripheralController(dev);
+                if( dev )
+                {
+                    CorsairPeripheralController* controller = new CorsairPeripheralController(dev, info->path);

-            if(controller->GetDeviceType() != DEVICE_TYPE_UNKNOWN)
-            {
-                RGBController_CorsairPeripheral* rgb_controller = new RGBController_CorsairPeripheral(controller);
+                    if(controller->GetDeviceType() != DEVICE_TYPE_UNKNOWN)
+                    {
+                        RGBController_CorsairPeripheral* rgb_controller = new RGBController_CorsairPeripheral(controller);

-                rgb_controller->name = device_list[device_idx].name;
-                
-                rgb_controllers.push_back(rgb_controller);
+                        rgb_controller->name = device_list[device_idx].name;
+
+                        rgb_controllers.push_back(rgb_controller);
+                    }
+                }
            }
+            info = info->next;
        }
    }
-}
+}   /* DetectCorsairPeripheralControllers() */
+
+REGISTER_DETECTOR("Corsair Peripheral", DetectCorsairPeripheralControllers);
@@ -0,0 +1,806 @@
+/*-----------------------------------------*\
+|  RGBController_CorsairPeripheral.cpp      |
+|                                           |
+|  Generic RGB Interface for Corsair RGB    |
+|  keyboard, mouse, and mousemat devices    |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 1/9/2020    |
+\*-----------------------------------------*/
+
+#include "RGBController_CorsairPeripheral.h"
+
+//0xFFFFFFFF indicates an unused entry in matrix
+#define NA  0xFFFFFFFF
+
+static unsigned int matrix_map[6][23] =
+    { {   0,  NA,  10,  18,  28,  36,  NA,  46,  55,  64,  74,  NA,  84,  93, 102,   6,  15,  24,  33,  26,  35,  44,  53 },
+      {   1,  11,  19,  29,  37,  47,  56,  65,  75,  85,  94,  NA, 103,   7,  25,  NA,  42,  51,  60,  62,  72,  82,  91 },
+      {   2,  NA,  12,  20,  30,  38,  NA,  48,  57,  66,  76,  86,  95, 104,  70,  80,  34,  43,  52,  9,   17,  27, 100 },
+      {   3,  NA,  13,  21,  31,  39,  NA,  49,  58,  67,  77,  87,  96, 105,  98, 112,  NA,  NA,  NA,  45,  54,  63,  NA },
+      {   4, 111,  22,  32,  40,  50,  NA,  59,  NA,  68,  78,  88,  97, 106,  61,  NA,  NA,  81,  NA,  73,  83,  92, 109 },
+      {   5,  14,  23,  NA,  NA,  NA,  NA,  41,  NA,  NA,  NA,  NA,  69,  79,  89,  71,  90,  99, 108, 101,  NA, 110,  NA } };
+
+static unsigned int matrix_map_k95_platinum[7][24] =
+    { {  NA,  NA,  NA,  NA, 107,   8,  NA,  NA,  NA,  NA,  NA,  NA,  NA,  NA,  NA,  NA,  NA,  NA,  NA,  NA,  16,  NA,  NA,  NA,},
+      { 113,   0,  NA,  10,  18,  28,  36,  NA,  46,  55,  64,  74,  NA,  84,  93, 102,   6,  15,  24,  33,  26,  35,  44,  53 },
+      { 114,   1,  11,  19,  29,  37,  47,  56,  65,  75,  85,  94,  NA, 103,   7,  25,  NA,  42,  51,  60,  62,  72,  82,  91 },
+      { 115,   2,  NA,  12,  20,  30,  38,  NA,  48,  57,  66,  76,  86,  95, 104,  70,  80,  34,  43,  52,  9,   17,  27, 100 },
+      { 116,   3,  NA,  13,  21,  31,  39,  NA,  49,  58,  67,  77,  87,  96, 105,  98, 112,  NA,  NA,  NA,  45,  54,  63,  NA },
+      { 117,   4, 111,  22,  32,  40,  50,  NA,  59,  NA,  68,  78,  88,  97, 106,  61,  NA,  NA,  81,  NA,  73,  83,  92, 109 },
+      { 118,   5,  14,  23,  NA,  NA,  NA,  NA,  41,  NA,  NA,  NA,  NA,  69,  79,  89,  71,  90,  99, 108, 101,  NA, 110,  NA } };
+
+static unsigned int matrix_map_k95[7][26] =
+    { {  NA,  NA,  NA, 131, 132, 133, 134,  NA,  NA,  NA,  NA,  NA,  NA,  NA,  NA,  NA,  NA,  NA,  NA, 107,   8,  NA,  NA,  16,  NA,  NA,},
+      { 113, 114, 115,   0,  NA,  10,  18,  28,  36,  NA,  46,  55,  64,  74,  NA,  84,  93, 102,   6,  15,  24,  33,  26,  35,  44,  53 },
+      { 116, 117, 118,   1,  11,  19,  29,  37,  47,  56,  65,  75,  85,  94,  NA, 103,   7,  25,  NA,  42,  51,  60,  62,  72,  82,  91 },
+      { 119, 120, 121,   2,  NA,  12,  20,  30,  38,  NA,  48,  57,  66,  76,  86,  95, 104,  70,  80,  34,  43,  52,  9,   17,  27, 100 },
+      { 122, 123, 124,   3,  NA,  13,  21,  31,  39,  NA,  49,  58,  67,  77,  87,  96, 105,  98, 112,  NA,  NA,  NA,  45,  54,  63,  NA },
+      { 125, 126, 127,   4, 111,  22,  32,  40,  50,  NA,  59,  NA,  68,  78,  88,  97, 106,  61,  NA,  NA,  81,  NA,  73,  83,  92, 109 },
+      { 128, 129, 130,   5,  14,  23,  NA,  NA,  NA,  NA,  41,  NA,  NA,  NA,  NA,  69,  79,  89,  71,  90,  99, 108, 101,  NA, 110,  NA } };
+
+/*---------------------------------------------------------*\
+| Normal Corsair Layout                                     |
+\*---------------------------------------------------------*/
+static const char* zone_names[] =
+{
+    "Keyboard",
+};
+
+static const unsigned int zone_sizes[] =
+{
+    113
+};
+
+static const zone_type zone_types[] =
+{
+    ZONE_TYPE_MATRIX,
+};
+
+/*---------------------------------------------------------*\
+| K95 Platinum                                              |
+\*---------------------------------------------------------*/
+static const char* zone_names_k95_platinum[] =
+{
+    "Keyboard",
+    "Light Bar"
+};
+
+static const unsigned int zone_sizes_k95_platinum[] =
+{
+    119,
+    19
+};
+
+static const zone_type zone_types_k95_platinum[] =
+{
+    ZONE_TYPE_MATRIX,
+    ZONE_TYPE_LINEAR
+};
+
+/*---------------------------------------------------------*\
+| K95 non-Platinum                                          |
+\*---------------------------------------------------------*/
+static const char* zone_names_k95[] =
+{
+    "Keyboard",
+};
+
+static const unsigned int zone_sizes_k95[] =
+{
+    135
+};
+
+static const zone_type zone_types_k95[] =
+{
+    ZONE_TYPE_MATRIX
+};
+
+
+static const char* led_names[] =
+{
+    "Key: Escape",          //0
+    "Key: `",               //1
+    "Key: Tab",             //2
+    "Key: Caps Lock",       //3
+    "Key: Left Shift",      //4
+    "Key: Left Control",    //5
+    "Key: F12",             //6
+    "Key: =",               //7
+    "Key: Lock",            //8
+    "Key: Number Pad 7",    //9
+    "Key: F1",              //12
+    "Key: 1",               //13
+    "Key: Q",               //14
+    "Key: A",               //15
+    "Key: Left Windows",    //17
+    "Key: Print Screen",    //18
+    "Key: Media Mute",      //20
+    "Key: Number Pad 8",    //21
+    "Key: F2",              //24
+    "Key: 2",               //25
+    "Key: W",               //26
+    "Key: S",               //27
+    "Key: Z",               //28
+    "Key: Left Alt",        //29
+    "Key: Scroll Lock",     //30
+    "Key: Backspace",       //31
+    "Key: Media Stop",      //32
+    "Key: Number Pad 9",    //33
+    "Key: F3",              //36
+    "Key: 3",               //37
+    "Key: E",               //38
+    "Key: D",               //39
+    "Key: X",               //40
+    "Key: Pause/Break",     //42
+    "Key: Delete",          //43
+    "Key: Media Previous",  //44
+    "Key: F4",              //48
+    "Key: 4",               //49
+    "Key: R",               //50
+    "Key: F",               //51
+    "Key: C",               //52
+    "Key: Space",           //53
+    "Key: Insert",          //54
+    "Key: End",             //55
+    "Key: Media Play/Pause",//56
+    "Key: Number Pad 4",    //57
+    "Key: F5",              //60
+    "Key: 5",               //61
+    "Key: T",               //62
+    "Key: G",               //63
+    "Key: V",               //64
+    "Key: Home",            //66
+    "Key: Page Down",       //67
+    "Key: Media Next",      //68
+    "Key: Number Pad 5",    //69
+    "Key: F6",              //72
+    "Key: 6",               //73
+    "Key: Y",               //74
+    "Key: H",               //75
+    "Key: B",               //76
+    "Key: Page Up",         //78
+    "Key: Right Shift",     //79
+    "Key: Num Lock",        //80
+    "Key: Number Pad 6",    //81
+    "Key: F7",              //84
+    "Key: 7",               //85
+    "Key: U",               //86
+    "Key: J",               //87
+    "Key: N",               //88
+    "Key: Right Alt",       //89
+    "Key: ]",               //90
+    "Key: Right Control",   //91
+    "Key: Number Pad /",    //92
+    "Key: Number Pad 1",    //93
+    "Key: F8",              //96
+    "Key: 8",               //97
+    "Key: I",               //98
+    "Key: K",               //99
+    "Key: M",               //100
+    "Key: Right Windows",   //101
+    "Key: \\ (ANSI)",       //102
+    "Key: Up Arrow",        //103
+    "Key: Number Pad *",    //104
+    "Key: Number Pad 2",    //105
+    "Key: F9",              //108
+    "Key: 9",               //109
+    "Key: O",               //110
+    "Key: L",               //111
+    "Key: ,",               //112
+    "Key: Menu",            //113
+    "Key: Left Arrow",      //115
+    "Key: Number Pad -",    //116
+    "Key: Number Pad 3",    //117
+    "Key: F10",             //120
+    "Key: 0",               //121
+    "Key: P",               //122
+    "Key: ;",               //123
+    "Key: .",               //124
+    "Key: Enter",           //126
+    "Key: Down Arrow",      //127
+    "Key: Number Pad +",    //128
+    "Key: Number Pad 0",    //129
+    "Key: F11",             //132
+    "Key: -",               //133
+    "Key: [",               //134
+    "Key: '",               //135
+    "Key: /",               //136
+    "Key: Brightness",      //137
+    "Key: Right Arrow",     //139
+    "Key: Number Pad Enter",//140
+    "Key: Number Pad .",    //141
+    "Key: / (ISO)",
+    "Key: \\ (ISO)",
+};
+
+static const char* led_names_k95_plat[] =
+{
+    "Key: Escape",          //0
+    "Key: `",               //1
+    "Key: Tab",             //2
+    "Key: Caps Lock",       //3
+    "Key: Left Shift",      //4
+    "Key: Left Control",    //5
+    "Key: F12",             //6
+    "Key: =",               //7
+    "Key: Lock",            //8
+    "Key: Number Pad 7",    //9
+    "Key: F1",              //12
+    "Key: 1",               //13
+    "Key: Q",               //14
+    "Key: A",               //15
+    "Key: Left Windows",    //17
+    "Key: Print Screen",    //18
+    "Key: Media Mute",      //20
+    "Key: Number Pad 8",    //21
+    "Key: F2",              //24
+    "Key: 2",               //25
+    "Key: W",               //26
+    "Key: S",               //27
+    "Key: Z",               //28
+    "Key: Left Alt",        //29
+    "Key: Scroll Lock",     //30
+    "Key: Backspace",       //31
+    "Key: Media Stop",      //32
+    "Key: Number Pad 9",    //33
+    "Key: F3",              //36
+    "Key: 3",               //37
+    "Key: E",               //38
+    "Key: D",               //39
+    "Key: X",               //40
+    "Key: Pause/Break",     //42
+    "Key: Delete",          //43
+    "Key: Media Previous",  //44
+    "Key: F4",              //48
+    "Key: 4",               //49
+    "Key: R",               //50
+    "Key: F",               //51
+    "Key: C",               //52
+    "Key: Space",           //53
+    "Key: Insert",          //54
+    "Key: End",             //55
+    "Key: Media Play/Pause",//56
+    "Key: Number Pad 4",    //57
+    "Key: F5",              //60
+    "Key: 5",               //61
+    "Key: T",               //62
+    "Key: G",               //63
+    "Key: V",               //64
+    "Key: Home",            //66
+    "Key: Page Down",       //67
+    "Key: Media Next",      //68
+    "Key: Number Pad 5",    //69
+    "Key: F6",              //72
+    "Key: 6",               //73
+    "Key: Y",               //74
+    "Key: H",               //75
+    "Key: B",               //76
+    "Key: Page Up",         //78
+    "Key: Right Shift",     //79
+    "Key: Num Lock",        //80
+    "Key: Number Pad 6",    //81
+    "Key: F7",              //84
+    "Key: 7",               //85
+    "Key: U",               //86
+    "Key: J",               //87
+    "Key: N",               //88
+    "Key: Right Alt",       //89
+    "Key: ]",               //90
+    "Key: Right Control",   //91
+    "Key: Number Pad /",    //92
+    "Key: Number Pad 1",    //93
+    "Key: F8",              //96
+    "Key: 8",               //97
+    "Key: I",               //98
+    "Key: K",               //99
+    "Key: M",               //100
+    "Key: Right Windows",   //101
+    "Key: \\ (ANSI)",       //102
+    "Key: Up Arrow",        //103
+    "Key: Number Pad *",    //104
+    "Key: Number Pad 2",    //105
+    "Key: F9",              //108
+    "Key: 9",               //109
+    "Key: O",               //110
+    "Key: L",               //111
+    "Key: ,",               //112
+    "Key: Menu",            //113
+    "Key: Left Arrow",      //115
+    "Key: Number Pad -",    //116
+    "Key: Number Pad 3",    //117
+    "Key: F10",             //120
+    "Key: 0",               //121
+    "Key: P",               //122
+    "Key: ;",               //123
+    "Key: .",               //124
+    "Key: Enter",           //126
+    "Key: Down Arrow",      //127
+    "Key: Number Pad +",    //128
+    "Key: Number Pad 0",    //129
+    "Key: F11",             //132
+    "Key: -",               //133
+    "Key: [",               //134
+    "Key: '",               //135
+    "Key: /",               //136
+    "Key: Brightness",      //137
+    "Key: Right Arrow",     //139
+    "Key: Number Pad Enter",//140
+    "Key: Number Pad .",    //141
+    "Key: / (ISO)",
+    "Key: \\ (ISO)",
+    "Key: Macro G1",
+    "Key: Macro G2",
+    "Key: Macro G3",
+    "Key: Macro G4",
+    "Key: Macro G5",
+    "Key: Macro G6",
+    "Light Bar 1",
+    "Light Bar 2",
+    "Light Bar 3",
+    "Light Bar 4",
+    "Light Bar 5",
+    "Light Bar 6",
+    "Light Bar 7",
+    "Light Bar 8",
+    "Light Bar 9",
+    "Light Bar 10",
+    "Light Bar 11",
+    "Light Bar 12",
+    "Light Bar 13",
+    "Light Bar 14",
+    "Light Bar 15",
+    "Light Bar 16",
+    "Light Bar 17",
+    "Light Bar 18",
+    "Light Bar 19"
+};
+
+static const char* led_names_k95[] =
+{
+    "Key: Escape",          //0
+    "Key: `",               //1
+    "Key: Tab",             //2
+    "Key: Caps Lock",       //3
+    "Key: Left Shift",      //4
+    "Key: Left Control",    //5
+    "Key: F12",             //6
+    "Key: =",               //7
+    "Key: Lock",            //8
+    "Key: Number Pad 7",    //9
+    "Key: F1",              //12
+    "Key: 1",               //13
+    "Key: Q",               //14
+    "Key: A",               //15
+    "Key: Left Windows",    //17
+    "Key: Print Screen",    //18
+    "Key: Media Mute",      //20
+    "Key: Number Pad 8",    //21
+    "Key: F2",              //24
+    "Key: 2",               //25
+    "Key: W",               //26
+    "Key: S",               //27
+    "Key: Z",               //28
+    "Key: Left Alt",        //29
+    "Key: Scroll Lock",     //30
+    "Key: Backspace",       //31
+    "Key: Media Stop",      //32
+    "Key: Number Pad 9",    //33
+    "Key: F3",              //36
+    "Key: 3",               //37
+    "Key: E",               //38
+    "Key: D",               //39
+    "Key: X",               //40
+    "Key: Pause/Break",     //42
+    "Key: Delete",          //43
+    "Key: Media Previous",  //44
+    "Key: F4",              //48
+    "Key: 4",               //49
+    "Key: R",               //50
+    "Key: F",               //51
+    "Key: C",               //52
+    "Key: Space",           //53
+    "Key: Insert",          //54
+    "Key: End",             //55
+    "Key: Media Play/Pause",//56
+    "Key: Number Pad 4",    //57
+    "Key: F5",              //60
+    "Key: 5",               //61
+    "Key: T",               //62
+    "Key: G",               //63
+    "Key: V",               //64
+    "Key: Home",            //66
+    "Key: Page Down",       //67
+    "Key: Media Next",      //68
+    "Key: Number Pad 5",    //69
+    "Key: F6",              //72
+    "Key: 6",               //73
+    "Key: Y",               //74
+    "Key: H",               //75
+    "Key: B",               //76
+    "Key: Page Up",         //78
+    "Key: Right Shift",     //79
+    "Key: Num Lock",        //80
+    "Key: Number Pad 6",    //81
+    "Key: F7",              //84
+    "Key: 7",               //85
+    "Key: U",               //86
+    "Key: J",               //87
+    "Key: N",               //88
+    "Key: Right Alt",       //89
+    "Key: ]",               //90
+    "Key: Right Control",   //91
+    "Key: Number Pad /",    //92
+    "Key: Number Pad 1",    //93
+    "Key: F8",              //96
+    "Key: 8",               //97
+    "Key: I",               //98
+    "Key: K",               //99
+    "Key: M",               //100
+    "Key: Right Windows",   //101
+    "Key: \\ (ANSI)",       //102
+    "Key: Up Arrow",        //103
+    "Key: Number Pad *",    //104
+    "Key: Number Pad 2",    //105
+    "Key: F9",              //108
+    "Key: 9",               //109
+    "Key: O",               //110
+    "Key: L",               //111
+    "Key: ,",               //112
+    "Key: Menu",            //113
+    "Key: Left Arrow",      //115
+    "Key: Number Pad -",    //116
+    "Key: Number Pad 3",    //117
+    "Key: F10",             //120
+    "Key: 0",               //121
+    "Key: P",               //122
+    "Key: ;",               //123
+    "Key: .",               //124
+    "Key: Enter",           //126
+    "Key: Down Arrow",      //127
+    "Key: Number Pad +",    //128
+    "Key: Number Pad 0",    //129
+    "Key: F11",             //132
+    "Key: -",               //133
+    "Key: [",               //134
+    "Key: '",               //135
+    "Key: /",               //136
+    "Key: Brightness",      //137
+    "Key: Right Arrow",     //139
+    "Key: Number Pad Enter",//140
+    "Key: Number Pad .",    //141
+    "Key: / (ISO)",
+    "Key: \\ (ISO)",
+    "Key: Macro G1",
+    "Key: Macro G2",
+    "Key: Macro G3",
+    "Key: Macro G4",
+    "Key: Macro G5",
+    "Key: Macro G6",
+    "Key: Macro G7",
+    "Key: Macro G8",
+    "Key: Macro G9",
+    "Key: Macro G10",
+    "Key: Macro G11",
+    "Key: Macro G12",
+    "Key: Macro G13",
+    "Key: Macro G14",
+    "Key: Macro G15",
+    "Key: Macro G16",
+    "Key: Macro G17",
+    "Key: Macro G18",
+    "Key: MR",
+    "Key: M1",
+    "Key: M2",
+    "Key: M3",
+};
+
+static const char* corsair_mouse_leds[] =
+{
+    "Mouse LED 1",
+    "Mouse LED 2",
+    "Mouse LED 3",
+    "Mouse LED 4",
+    "Mouse LED 5",
+    "Mouse LED 6",
+    "Mouse LED 7",
+    "Mouse LED 8",
+    "Mouse LED 9",
+    "Mouse LED 10",
+    "Mouse LED 11",
+    "Mouse LED 12",
+    "Mouse LED 13",
+    "Mouse LED 14",
+    "Mouse LED 15",
+};
+
+static const char* corsair_sabre_rgb_leds[] =
+{
+    "",
+    "Underglow",
+    "Logo",
+    "DPI",
+    "Scroll Wheel",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    ""
+};
+
+static const char* corsair_harpoon_pro_leds[] =
+{
+    "",
+    "",
+    "",
+    "Logo",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+};
+
+RGBController_CorsairPeripheral::RGBController_CorsairPeripheral(CorsairPeripheralController* corsair_ptr)
+{
+    corsair = corsair_ptr;
+
+    name        = "Corsair RGB Peripheral Device";
+    description = "Corsair RGB Peripheral Device";
+    type        = corsair->GetDeviceType();
+    version     = corsair->GetFirmwareString();
+    location    = corsair->GetDeviceLocation();
+
+    physical_layout = corsair->GetPhysicalLayout();
+    logical_layout  = corsair->GetLogicalLayout();
+
+    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();
+}
+
+RGBController_CorsairPeripheral::~RGBController_CorsairPeripheral()
+{
+    /*---------------------------------------------------------*\
+    | Delete the matrix map                                     |
+    \*---------------------------------------------------------*/
+    for(unsigned int zone_index = 0; zone_index < zones.size(); zone_index++)
+    {
+        if(zones[zone_index].matrix_map != NULL)
+        {
+            delete zones[zone_index].matrix_map;
+        }
+    }
+}
+
+void RGBController_CorsairPeripheral::SetupZones()
+{
+    /*---------------------------------------------------------*\
+    | Determine number of zones                                 |
+    |   For now, keyboard has 2 zones and mousemat has 1        |
+    \*---------------------------------------------------------*/
+    unsigned int num_zones = 0;
+
+    switch(type)
+    {
+        case DEVICE_TYPE_KEYBOARD:
+            if (logical_layout == CORSAIR_TYPE_K95_PLAT)
+            {
+                num_zones = 2;
+                break;
+            }
+            num_zones = 1;
+            break;
+
+        case DEVICE_TYPE_MOUSE:
+        case DEVICE_TYPE_MOUSEMAT:
+            num_zones = 1;
+            break;
+
+        case DEVICE_TYPE_HEADSET_STAND:
+            num_zones = 2;
+            break;
+    }
+
+    /*---------------------------------------------------------*\
+    | Set up zones                                              |
+    \*---------------------------------------------------------*/
+    unsigned int total_led_count = 0;
+    for(unsigned int zone_idx = 0; zone_idx < num_zones; zone_idx++)
+    {
+        zone new_zone;
+        switch(type)
+        {
+            case DEVICE_TYPE_KEYBOARD:
+                if (logical_layout == CORSAIR_TYPE_K95_PLAT)
+                {
+                    new_zone.name                   = zone_names_k95_platinum[zone_idx];
+                    new_zone.type                   = zone_types_k95_platinum[zone_idx];
+                    new_zone.leds_min               = zone_sizes_k95_platinum[zone_idx];
+                    new_zone.leds_max               = zone_sizes_k95_platinum[zone_idx];
+                    new_zone.leds_count             = zone_sizes_k95_platinum[zone_idx];
+
+                    if(zone_types[zone_idx] == ZONE_TYPE_MATRIX)
+                    {
+                        new_zone.matrix_map         = new matrix_map_type;
+                        new_zone.matrix_map->height = 7;
+                        new_zone.matrix_map->width  = 24;
+                        new_zone.matrix_map->map    = (unsigned int *)&matrix_map_k95_platinum;
+                    }
+                    else
+                    {
+                        new_zone.matrix_map         = NULL;
+                    }
+                }
+                else if (logical_layout == CORSAIR_TYPE_K95)
+                {
+                    new_zone.name                   = zone_names_k95[zone_idx];
+                    new_zone.type                   = zone_types_k95[zone_idx];
+                    new_zone.leds_min               = zone_sizes_k95[zone_idx];
+                    new_zone.leds_max               = zone_sizes_k95[zone_idx];
+                    new_zone.leds_count             = zone_sizes_k95[zone_idx];
+
+                    if(zone_types[zone_idx] == ZONE_TYPE_MATRIX)
+                    {
+                        new_zone.matrix_map         = new matrix_map_type;
+                        new_zone.matrix_map->height = 7;
+                        new_zone.matrix_map->width  = 26;
+                        new_zone.matrix_map->map    = (unsigned int *)&matrix_map_k95;
+                    }
+                    else
+                    {
+                        new_zone.matrix_map         = NULL;
+                    }
+                }
+                else //default layout
+                {
+                    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];
+
+                    if(zone_types[zone_idx] == ZONE_TYPE_MATRIX)
+                    {
+                        new_zone.matrix_map         = new matrix_map_type;
+                        new_zone.matrix_map->height = 6;
+                        new_zone.matrix_map->width  = 23;
+                        new_zone.matrix_map->map    = (unsigned int *)&matrix_map;
+                    }
+                    else
+                    {
+                        new_zone.matrix_map         = NULL;
+                    }
+                }
+                break;
+
+
+            case DEVICE_TYPE_MOUSE:
+                new_zone.name           = "Mouse Zone";
+                new_zone.type           = ZONE_TYPE_SINGLE;
+                new_zone.leds_min       = 15;
+                new_zone.leds_max       = 15;
+                new_zone.leds_count     = 15;
+                new_zone.matrix_map     = NULL;
+                break;
+
+            case DEVICE_TYPE_MOUSEMAT:
+                new_zone.name           = "Mousemat Zone";
+                new_zone.type           = ZONE_TYPE_LINEAR;
+                new_zone.leds_min       = 15;
+                new_zone.leds_max       = 15;
+                new_zone.leds_count     = 15;
+                new_zone.matrix_map     = NULL;
+                break;
+
+            case DEVICE_TYPE_HEADSET_STAND:
+                if(zone_idx == 0)
+                {
+                    new_zone.name           = "Base LED Strip";
+                    new_zone.type           = ZONE_TYPE_LINEAR;
+                    new_zone.leds_min       = 8;
+                    new_zone.leds_max       = 8;
+                    new_zone.leds_count     = 8;
+                    new_zone.matrix_map     = NULL;
+                }
+                else
+                {
+                    new_zone.name           = "Logo";
+                    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;
+                }
+                break;
+        }
+
+        zones.push_back(new_zone);
+
+        total_led_count += new_zone.leds_count;
+    }
+
+    for(unsigned int led_idx = 0; led_idx < total_led_count; led_idx++)
+    {
+        led new_led;
+
+        switch(type)
+        {
+            case DEVICE_TYPE_KEYBOARD:
+                if(logical_layout == CORSAIR_TYPE_K95_PLAT)
+                {
+                    new_led.name = led_names_k95_plat[led_idx];
+                }
+                else if(logical_layout == CORSAIR_TYPE_K95)
+                {
+                    new_led.name = led_names_k95[led_idx];
+                }
+                else
+                {
+                    new_led.name = led_names[led_idx];
+                }
+                break;
+
+            case DEVICE_TYPE_MOUSE:
+                new_led.name = corsair_mouse_leds[led_idx];
+                break;
+            
+            case DEVICE_TYPE_MOUSEMAT:
+            case DEVICE_TYPE_HEADSET_STAND:
+                new_led.name = "Mousemat LED ";
+                new_led.name.append(std::to_string(led_idx + 1));
+                break;
+        }
+        
+        leds.push_back(new_led);
+    }
+
+    SetupColors();
+}
+
+void RGBController_CorsairPeripheral::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_CorsairPeripheral::DeviceUpdateLEDs()
+{
+    corsair->SetLEDs(colors);
+}
+
+void RGBController_CorsairPeripheral::UpdateZoneLEDs(int /*zone*/)
+{
+    corsair->SetLEDs(colors);
+}
+
+void RGBController_CorsairPeripheral::UpdateSingleLED(int /*led*/)
+{
+    corsair->SetLEDs(colors);
+}
+
+void RGBController_CorsairPeripheral::SetCustomMode()
+{
+    active_mode = 0;
+}
+
+void RGBController_CorsairPeripheral::DeviceUpdateMode()
+{
+
+}
@@ -17,6 +17,9 @@ public:
    RGBController_CorsairPeripheral(CorsairPeripheralController* corsair_ptr);
    ~RGBController_CorsairPeripheral();

+    int         physical_layout;
+    int         logical_layout;
+
    void        SetupZones();

    void        ResizeZone(int zone, int new_size);
@@ -26,7 +29,7 @@ public:
    void        UpdateSingleLED(int led);

    void        SetCustomMode();
-    void        UpdateMode();
+    void        DeviceUpdateMode();

 private:
    CorsairPeripheralController*   corsair;
@@ -36,7 +36,7 @@ std::string CorsairVengeanceController::GetDeviceLocation()
    snprintf(addr, 5, "0x%02X", dev);
    return_string.append(", address ");
    return_string.append(addr);
-    return(return_string);
+    return("I2C: " + return_string);
 }

 unsigned int CorsairVengeanceController::GetLEDCount()
@@ -1,7 +1,9 @@
+#include "Detector.h"
 #include "CorsairVengeanceController.h"
 #include "RGBController.h"
 #include "RGBController_CorsairVengeance.h"
 #include "i2c_smbus.h"
+#include "pci_ids.h"
 #include <vector>
 #include <stdio.h>
 #include <stdlib.h>
@@ -57,69 +59,74 @@ void DetectCorsairVengeanceControllers(std::vector<i2c_smbus_interface*> &busses

    for (unsigned int bus = 0; bus < busses.size(); bus++)
    {
-        // Check for Corsair controller at 0x58
-        if (TestForCorsairVengeanceController(busses[bus], 0x58))
+        IF_DRAM_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device)
        {
-            new_corsair = new CorsairVengeanceController(busses[bus], 0x58);
-            new_controller = new RGBController_CorsairVengeance(new_corsair);
-            rgb_controllers.push_back(new_controller);
-        }
+            // Check for Corsair controller at 0x58
+            if (TestForCorsairVengeanceController(busses[bus], 0x58))
+            {
+                new_corsair = new CorsairVengeanceController(busses[bus], 0x58);
+                new_controller = new RGBController_CorsairVengeance(new_corsair);
+                rgb_controllers.push_back(new_controller);
+            }

-        // Check for Corsair controller at 0x59
-        if (TestForCorsairVengeanceController(busses[bus], 0x59))
-        {
-            new_corsair = new CorsairVengeanceController(busses[bus], 0x59);
-            new_controller = new RGBController_CorsairVengeance(new_corsair);
-            rgb_controllers.push_back(new_controller);
-        }
+            // Check for Corsair controller at 0x59
+            if (TestForCorsairVengeanceController(busses[bus], 0x59))
+            {
+                new_corsair = new CorsairVengeanceController(busses[bus], 0x59);
+                new_controller = new RGBController_CorsairVengeance(new_corsair);
+                rgb_controllers.push_back(new_controller);
+            }

-        // Check for Corsair controller at 0x5A
-        if (TestForCorsairVengeanceController(busses[bus], 0x5A))
-        {
-            new_corsair = new CorsairVengeanceController(busses[bus], 0x5A);
-            new_controller = new RGBController_CorsairVengeance(new_corsair);
-            rgb_controllers.push_back(new_controller);
-        }
+            // Check for Corsair controller at 0x5A
+            if (TestForCorsairVengeanceController(busses[bus], 0x5A))
+            {
+                new_corsair = new CorsairVengeanceController(busses[bus], 0x5A);
+                new_controller = new RGBController_CorsairVengeance(new_corsair);
+                rgb_controllers.push_back(new_controller);
+            }

-        // Check for Corsair controller at 0x5B
-        if (TestForCorsairVengeanceController(busses[bus], 0x5B))
-        {
-            new_corsair = new CorsairVengeanceController(busses[bus], 0x5B);
-            new_controller = new RGBController_CorsairVengeance(new_corsair);
-            rgb_controllers.push_back(new_controller);
-        }
+            // Check for Corsair controller at 0x5B
+            if (TestForCorsairVengeanceController(busses[bus], 0x5B))
+            {
+                new_corsair = new CorsairVengeanceController(busses[bus], 0x5B);
+                new_controller = new RGBController_CorsairVengeance(new_corsair);
+                rgb_controllers.push_back(new_controller);
+            }

-        // Check for Corsair controller at 0x5C
-        if (TestForCorsairVengeanceController(busses[bus], 0x5C))
-        {
-            new_corsair = new CorsairVengeanceController(busses[bus], 0x5C);
-            new_controller = new RGBController_CorsairVengeance(new_corsair);
-            rgb_controllers.push_back(new_controller);
-        }
+            // Check for Corsair controller at 0x5C
+            if (TestForCorsairVengeanceController(busses[bus], 0x5C))
+            {
+                new_corsair = new CorsairVengeanceController(busses[bus], 0x5C);
+                new_controller = new RGBController_CorsairVengeance(new_corsair);
+                rgb_controllers.push_back(new_controller);
+            }

-        // Check for Corsair controller at 0x5D
-        if (TestForCorsairVengeanceController(busses[bus], 0x5D))
-        {
-            new_corsair = new CorsairVengeanceController(busses[bus], 0x5D);
-            new_controller = new RGBController_CorsairVengeance(new_corsair);
-            rgb_controllers.push_back(new_controller);
-        }
+            // Check for Corsair controller at 0x5D
+            if (TestForCorsairVengeanceController(busses[bus], 0x5D))
+            {
+                new_corsair = new CorsairVengeanceController(busses[bus], 0x5D);
+                new_controller = new RGBController_CorsairVengeance(new_corsair);
+                rgb_controllers.push_back(new_controller);
+            }

-        // Check for Corsair controller at 0x5E
-        if (TestForCorsairVengeanceController(busses[bus], 0x5E))
-        {
-            new_corsair = new CorsairVengeanceController(busses[bus], 0x5E);
-            new_controller = new RGBController_CorsairVengeance(new_corsair);
-            rgb_controllers.push_back(new_controller);
-        }
+            // Check for Corsair controller at 0x5E
+            if (TestForCorsairVengeanceController(busses[bus], 0x5E))
+            {
+                new_corsair = new CorsairVengeanceController(busses[bus], 0x5E);
+                new_controller = new RGBController_CorsairVengeance(new_corsair);
+                rgb_controllers.push_back(new_controller);
+            }

-        // Check for Corsair controller at 0x5F
-        if (TestForCorsairVengeanceController(busses[bus], 0x5F))
-        {
-            new_corsair = new CorsairVengeanceController(busses[bus], 0x5F);
-            new_controller = new RGBController_CorsairVengeance(new_corsair);
-            rgb_controllers.push_back(new_controller);
+            // Check for Corsair controller at 0x5F
+            if (TestForCorsairVengeanceController(busses[bus], 0x5F))
+            {
+                new_corsair = new CorsairVengeanceController(busses[bus], 0x5F);
+                new_controller = new RGBController_CorsairVengeance(new_corsair);
+                rgb_controllers.push_back(new_controller);
+            }
        }
    }

-}   /* DetectCorsairVengeanceControllers() */
+}   /* DetectCorsairVengeanceControllers() */
+
+REGISTER_I2C_DETECTOR("Corsair Vengeance", DetectCorsairVengeanceControllers);
@@ -101,7 +101,7 @@ void RGBController_CorsairVengeance::SetCustomMode()
    active_mode = 0;
 }

-void RGBController_CorsairVengeance::UpdateMode()
+void RGBController_CorsairVengeance::DeviceUpdateMode()
 {
    corsair->SetMode(modes[active_mode].value);
 }
@@ -26,7 +26,7 @@ public:
    void        UpdateSingleLED(int led);

    void        SetCustomMode();
-    void        UpdateMode();
+    void        DeviceUpdateMode();

 private:
    CorsairVengeanceController* corsair;
@@ -47,7 +47,7 @@ std::string CorsairVengeanceProController::GetDeviceLocation()
    snprintf(addr, 5, "0x%02X", dev);
    return_string.append(", address ");
    return_string.append(addr);
-    return(return_string);
+    return("I2C: " + return_string);
 }

 unsigned int CorsairVengeanceProController::GetLEDCount()
@@ -1,7 +1,9 @@
+#include "Detector.h"
 #include "CorsairVengeanceProController.h"
 #include "RGBController.h"
 #include "RGBController_CorsairVengeancePro.h"
 #include "i2c_smbus.h"
+#include "pci_ids.h"
 #include <vector>
 #include <stdio.h>
 #include <stdlib.h>
@@ -65,69 +67,74 @@ void DetectCorsairVengeanceProControllers(std::vector<i2c_smbus_interface*> &bus

    for (unsigned int bus = 0; bus < busses.size(); bus++)
    {
-        // Check for Corsair controller at 0x58
-        if (TestForCorsairVengeanceProController(busses[bus], 0x58))
+        IF_DRAM_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device)
        {
-            new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x58);
-            new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
-            rgb_controllers.push_back(new_controller);
-        }
+            // Check for Corsair controller at 0x58
+            if (TestForCorsairVengeanceProController(busses[bus], 0x58))
+            {
+                new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x58);
+                new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
+                rgb_controllers.push_back(new_controller);
+            }

-        // Check for Corsair controller at 0x59
-        if (TestForCorsairVengeanceProController(busses[bus], 0x59))
-        {
-            new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x59);
-            new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
-            rgb_controllers.push_back(new_controller);
-        }
+            // Check for Corsair controller at 0x59
+            if (TestForCorsairVengeanceProController(busses[bus], 0x59))
+            {
+                new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x59);
+                new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
+                rgb_controllers.push_back(new_controller);
+            }

-        // Check for Corsair controller at 0x5A
-        if (TestForCorsairVengeanceProController(busses[bus], 0x5A))
-        {
-            new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5A);
-            new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
-            rgb_controllers.push_back(new_controller);
-        }
+            // Check for Corsair controller at 0x5A
+            if (TestForCorsairVengeanceProController(busses[bus], 0x5A))
+            {
+                new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5A);
+                new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
+                rgb_controllers.push_back(new_controller);
+            }

-        // Check for Corsair controller at 0x5B
-        if (TestForCorsairVengeanceProController(busses[bus], 0x5B))
-        {
-            new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5B);
-            new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
-            rgb_controllers.push_back(new_controller);
-        }
+            // Check for Corsair controller at 0x5B
+            if (TestForCorsairVengeanceProController(busses[bus], 0x5B))
+            {
+                new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5B);
+                new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
+                rgb_controllers.push_back(new_controller);
+            }

-        // Check for Corsair controller at 0x5C
-        if (TestForCorsairVengeanceProController(busses[bus], 0x5C))
-        {
-            new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5C);
-            new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
-            rgb_controllers.push_back(new_controller);
-        }
+            // Check for Corsair controller at 0x5C
+            if (TestForCorsairVengeanceProController(busses[bus], 0x5C))
+            {
+                new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5C);
+                new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
+                rgb_controllers.push_back(new_controller);
+            }

-        // Check for Corsair controller at 0x5D
-        if (TestForCorsairVengeanceProController(busses[bus], 0x5D))
-        {
-            new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5D);
-            new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
-            rgb_controllers.push_back(new_controller);
-        }
+            // Check for Corsair controller at 0x5D
+            if (TestForCorsairVengeanceProController(busses[bus], 0x5D))
+            {
+                new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5D);
+                new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
+                rgb_controllers.push_back(new_controller);
+            }

-        // Check for Corsair controller at 0x5E
-        if (TestForCorsairVengeanceProController(busses[bus], 0x5E))
-        {
-            new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5E);
-            new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
-            rgb_controllers.push_back(new_controller);
-        }
+            // Check for Corsair controller at 0x5E
+            if (TestForCorsairVengeanceProController(busses[bus], 0x5E))
+            {
+                new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5E);
+                new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
+                rgb_controllers.push_back(new_controller);
+            }

-        // Check for Corsair controller at 0x5F
-        if (TestForCorsairVengeanceProController(busses[bus], 0x5F))
-        {
-            new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5F);
-            new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
-            rgb_controllers.push_back(new_controller);
+            // Check for Corsair controller at 0x5F
+            if (TestForCorsairVengeanceProController(busses[bus], 0x5F))
+            {
+                new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5F);
+                new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
+                rgb_controllers.push_back(new_controller);
+            }
        }
    }

-}   /* DetectCorsairVengeanceProControllers() */
+}   /* DetectCorsairVengeanceProControllers() */
+
+REGISTER_I2C_DETECTOR("Corsair Vengeance Pro", DetectCorsairVengeanceProControllers);
@@ -18,6 +18,16 @@ RGBController_CorsairVengeancePro::RGBController_CorsairVengeancePro(CorsairVeng
    description = "Corsair Vengeance Pro RGB Device";
    location    = corsair->GetDeviceLocation();

+    mode Direct;
+    Direct.name       = "Direct";
+    Direct.value      = CORSAIR_PRO_MODE_STATIC;
+    Direct.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.speed_min  = 0;
+    Direct.speed_max  = 0;
+    Direct.speed      = 0;
+    Direct.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
    mode ColorShift;
    ColorShift.name       = "Color Shift";
    ColorShift.value      = CORSAIR_PRO_MODE_COLOR_SHIFT;
@@ -134,16 +144,6 @@ RGBController_CorsairVengeancePro::RGBController_CorsairVengeancePro(CorsairVeng
    Sequential.colors.resize(1);
    modes.push_back(Sequential);

-    mode Static;
-    Static.name       = "Static";
-    Static.value      = CORSAIR_PRO_MODE_STATIC;
-    Static.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
-    Static.speed_min  = 0;
-    Static.speed_max  = 0;
-    Static.speed      = 0;
-    Static.color_mode = MODE_COLORS_PER_LED;
-    modes.push_back(Static);
-
    SetupZones();

    active_mode = 9;
@@ -216,10 +216,10 @@ void RGBController_CorsairVengeancePro::UpdateSingleLED(int led)

 void RGBController_CorsairVengeancePro::SetCustomMode()
 {
-    active_mode = 9;
+    active_mode = 0;
 }

-void RGBController_CorsairVengeancePro::UpdateMode()
+void RGBController_CorsairVengeancePro::DeviceUpdateMode()
 {
    unsigned int corsair_direction = 0;
    bool random = (modes[active_mode].color_mode == MODE_COLORS_RANDOM);
@@ -26,7 +26,7 @@ public:
    void        UpdateSingleLED(int led);

    void        SetCustomMode();
-    void        UpdateMode();
+    void        DeviceUpdateMode();

 private:
    CorsairVengeanceProController* corsair;
@@ -34,7 +34,7 @@ std::string CrucialController::GetDeviceLocation()
    snprintf(addr, 5, "0x%02X", dev);
    return_string.append(", address ");
    return_string.append(addr);
-    return(return_string);
+    return("I2C: " + return_string);
 }

 unsigned int CrucialController::GetLEDCount()
@@ -1,7 +1,9 @@
+#include "Detector.h"
 #include "CrucialController.h"
 #include "RGBController.h"
 #include "RGBController_Crucial.h"
 #include "i2c_smbus.h"
+#include "pci_ids.h"
 #include <vector>
 #include <stdio.h>
 #include <stdlib.h>
@@ -73,16 +75,21 @@ void DetectCrucialControllers(std::vector<i2c_smbus_interface*> &busses, std::ve

    for (unsigned int bus = 0; bus < busses.size(); bus++)
    {
-        // Add Crucial controllers
-        for (unsigned int address_list_idx = 0; address_list_idx < CRUCIAL_ADDRESS_COUNT; address_list_idx++)
+        IF_DRAM_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device)
        {
-            if (TestForCrucialController(busses[bus], crucial_addresses[address_list_idx]))
+            // Add Crucial controllers
+            for (unsigned int address_list_idx = 0; address_list_idx < CRUCIAL_ADDRESS_COUNT; address_list_idx++)
            {
-                new_crucial = new CrucialController(busses[bus], crucial_addresses[address_list_idx]);
-                new_controller = new RGBController_Crucial(new_crucial);
-                rgb_controllers.push_back(new_controller);
+                if (TestForCrucialController(busses[bus], crucial_addresses[address_list_idx]))
+                {
+                    new_crucial = new CrucialController(busses[bus], crucial_addresses[address_list_idx]);
+                    new_controller = new RGBController_Crucial(new_crucial);
+                    rgb_controllers.push_back(new_controller);
+                }
            }
        }
    }

 }   /* DetectCrucialControllers() */
+
+REGISTER_I2C_DETECTOR("Crucial", DetectCrucialControllers);
@@ -177,7 +177,7 @@ void RGBController_Crucial::SetCustomMode()
    active_mode = 0;
 }

-void RGBController_Crucial::UpdateMode()
+void RGBController_Crucial::DeviceUpdateMode()
 {
    crucial->SetMode(modes[active_mode].value);
 }
@@ -26,7 +26,7 @@ public:
    void        UpdateSingleLED(int led);

    void        SetCustomMode();
-    void        UpdateMode();
+    void        DeviceUpdateMode();

 private:
    CrucialController*  crucial;
@@ -0,0 +1,495 @@
+#include "Detector.h"
+#include "RGBController.h"
+#include "RGBController_Dummy.h"
+#include "SettingsManager.h"
+#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <fcntl.h>
+#include <string.h>
+#include <fstream>
+#include <iostream>
+#include <string>
+
+
+//0xFFFFFFFF indicates an unused entry in matrix
+#define NA  0xFFFFFFFF
+
+static unsigned int debug_keyboard_matrix_map[6][23] =
+    { {   0,  NA,  16,  30,  44,  54,  NA,  65,  75,  84,  95,  NA,   8,  23 ,  38,   6 ,  22,  36,  49,  NA,  NA,  NA,  NA },
+      {   1,  17,  31,  45,  55,  66,  76,  85,  96,   9,  24,  NA,  39,   7 ,  37,  NA ,  60,  70,  80,  52,  63,  73,  82 },
+      {   2,  NA,  18,  32,  46,  56,  NA,  67,  77,  86,  97,  10,  25,  40 ,  90,  101,  50,  61,  71,  51,  62,  72,  93 },
+      {   3,  NA,  19,  33,  47,  57,  NA,  68,  78,  87,  98,  11,  26,  41 ,  28,  14 ,  NA,  NA,  NA,  92, 103,  53,  NA },
+      {   4,  20,  34,  48,  58,  69,  NA,  79,  NA,  88,  99,  12,  27,  42 ,  81,  NA ,  NA, 102,  NA,  64,  74,  83, 104 },
+      {   5,  21,  35,  NA,  NA,  NA,  NA,  59,  NA,  NA,  NA,  NA,  89,  100,  13,  91 ,  15,  29,  43,  94,  NA, 105,  NA } };
+
+static const char *led_names[] =
+{
+    "Key: Escape",
+    "Key: `",
+    "Key: Tab",
+    "Key: Caps Lock",
+    "Key: Left Shift",
+    "Key: Left Control",
+    "Key: F12",
+    "Key: =",
+    "Key: F9",
+    "Key: 9",
+    "Key: O",
+    "Key: L",
+    "Key: ,",
+    "Key: Menu",
+    "Key: Enter (ISO)",
+    "Key: Left Arrow",
+    "Key: F1",
+    "Key: 1",
+    "Key: Q",
+    "Key: A",
+    "Key: \\ (ISO)",
+    "Key: Left Windows",
+    "Key: Print Screen",
+    "Key: F10",
+    "Key: 0",
+    "Key: P",
+    "Key: ;",
+    "Key: .",
+    "Key: Enter",
+    "Key: Down Arrow",
+    "Key: F2",
+    "Key: 2",
+    "Key: W",
+    "Key: S",
+    "Key: Z",
+    "Key: Left Alt",
+    "Key: Scroll Lock",
+    "Key: Backspace",
+    "Key: F11",
+    "Key: -",
+    "Key: [",
+    "Key: '",
+    "Key: /",
+    "Key: Right Arrow",
+    "Key: F3",
+    "Key: 3",
+    "Key: E",
+    "Key: D",
+    "Key: X",
+    "Key: Pause/Break",
+    "Key: Delete",
+    "Key: Number Pad 7",
+    "Key: Num Lock",
+    "Key: Number Pad 6",
+    "Key: F4",
+    "Key: 4",
+    "Key: R",
+    "Key: F",
+    "Key: C",
+    "Key: Space",
+    "Key: Insert",
+    "Key: End",
+    "Key: Number Pad 8",
+    "Key: Number Pad /",
+    "Key: Number Pad 1",
+    "Key: F5",
+    "Key: 5",
+    "Key: T",
+    "Key: G",
+    "Key: V",
+    "Key: Home",
+    "Key: Page Down",
+    "Key: Number Pad 9",
+    "Key: Number Pad *",
+    "Key: Number Pad 2",
+    "Key: F6",
+    "Key: 6",
+    "Key: Y",
+    "Key: H",
+    "Key: B",
+    "Key: Page Up",
+    "Key: Right Shift",
+    "Key: Number Pad -",
+    "Key: Number Pad 3",
+    "Key: F7",
+    "Key: 7",
+    "Key: U",
+    "Key: J",
+    "Key: N",
+    "Key: Right Alt",
+    "Key: ]",
+    "Key: Right Control",
+    "Key: Number Pad 4",
+    "Key: Number Pad +",
+    "Key: Number Pad 0",
+    "Key: F8",
+    "Key: 8",
+    "Key: I",
+    "Key: K",
+    "Key: M",
+    "Key: Right Windows",
+    "Key: \\ (ANSI)",
+    "Key: Up Arrow",
+    "Key: Number Pad 5",
+    "Key: Number Pad Enter",
+    "Key: Number Pad .",
+    "RGB Strip 1",
+    "RGB Strip 2",
+    "RGB Strip 3",
+    "RGB Strip 4",
+    "RGB Strip 5",
+    "RGB Strip 6",
+    "RGB Strip 7",
+    "RGB Strip 8",
+    "RGB Strip 9",
+    "RGB Strip 10",
+    "RGB Strip 11",
+    "RGB Strip 12",
+    "RGB Strip 13",
+    "RGB Strip 14",
+    "RGB Strip 15",
+    "RGB Strip 16",
+    "RGB Strip 17",
+    "RGB Strip 18",
+    "Key: Media Previous",
+    "Key: Media Play/Pause",
+    "Key: Media Next",
+    "Key: Media Mute"
+};
+
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectDebugControllers                                                                 *
+*                                                                                          *
+*       Add dummy controllers based on debug.txt                                           *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectDebugControllers(std::vector<RGBController*> &rgb_controllers)
+{
+    json            debug_settings;
+    
+    /*-------------------------------------------------*\
+    | Get Debug Device settings from settings manager   |
+    \*-------------------------------------------------*/
+    debug_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_DebugDevices");
+
+    /*-------------------------------------------------*\
+    | If the Debug settings contains devices, process   |
+    \*-------------------------------------------------*/
+    if(debug_settings.contains("devices"))
+    {
+        for(unsigned int device_idx = 0; device_idx < debug_settings["devices"].size(); device_idx++)
+        {
+            std::string type = "";
+
+            if(debug_settings["devices"][device_idx].contains("type"))
+            {
+                type = debug_settings["devices"][device_idx]["type"];
+            }
+
+            if(type == "motherboard")
+            {
+                /*---------------------------------------------------------*\
+                | Create a dummy motherboard                                |
+                \*---------------------------------------------------------*/
+                RGBController_Dummy* dummy_motherboard = new RGBController_Dummy();
+
+                dummy_motherboard->name                     = "Debug Motherboard";
+                dummy_motherboard->type                     = DEVICE_TYPE_MOTHERBOARD;
+                dummy_motherboard->description              = "Debug Motherboard Device";
+                dummy_motherboard->location                 = "Debug Motherboard Location";
+                dummy_motherboard->version                  = "Debug Motherboard Version";
+                dummy_motherboard->serial                   = "Debug Motherboard Serial";
+
+                /*---------------------------------------------------------*\
+                | Create a direct mode for the dummy motherboard            |
+                \*---------------------------------------------------------*/
+                mode dummy_motherboard_direct_mode;
+
+                dummy_motherboard_direct_mode.name          = "Direct";
+                dummy_motherboard_direct_mode.value         = 0;
+                dummy_motherboard_direct_mode.flags         = MODE_FLAG_HAS_PER_LED_COLOR;
+                dummy_motherboard_direct_mode.color_mode    = MODE_COLORS_PER_LED;
+
+                dummy_motherboard->modes.push_back(dummy_motherboard_direct_mode);
+
+                /*---------------------------------------------------------*\
+                | Create a single zone/LED for the dummy motherboard        |
+                \*---------------------------------------------------------*/
+                zone dummy_motherboard_single_zone;
+
+                dummy_motherboard_single_zone.name          = "Single Zone";
+                dummy_motherboard_single_zone.type          = ZONE_TYPE_SINGLE;
+                dummy_motherboard_single_zone.leds_min      = 1;
+                dummy_motherboard_single_zone.leds_max      = 1;
+                dummy_motherboard_single_zone.leds_count    = 1;
+                dummy_motherboard_single_zone.matrix_map    = NULL;
+
+                dummy_motherboard->zones.push_back(dummy_motherboard_single_zone);
+
+                led dummy_motherboard_single_led;
+
+                dummy_motherboard_single_led.name           = "Single LED";
+
+                dummy_motherboard->leds.push_back(dummy_motherboard_single_led);
+
+                /*---------------------------------------------------------*\
+                | Create a linear zone for the dummy motherboard            |
+                \*---------------------------------------------------------*/
+                zone dummy_motherboard_linear_zone;
+
+                dummy_motherboard_linear_zone.name          = "Linear Zone";
+                dummy_motherboard_linear_zone.type          = ZONE_TYPE_LINEAR;
+                dummy_motherboard_linear_zone.leds_min      = 10;
+                dummy_motherboard_linear_zone.leds_max      = 10;
+                dummy_motherboard_linear_zone.leds_count    = 10;
+                dummy_motherboard_linear_zone.matrix_map    = NULL;
+
+                dummy_motherboard->zones.push_back(dummy_motherboard_linear_zone);
+
+                for(std::size_t led_idx = 0; led_idx < 10; led_idx++)
+                {
+                    led dummy_motherboard_linear_led;
+
+                    dummy_motherboard_linear_led.name       = "Linear LED " + std::to_string(led_idx);
+
+                    dummy_motherboard->leds.push_back(dummy_motherboard_linear_led);
+                }
+
+                dummy_motherboard->SetupColors();
+
+                /*---------------------------------------------------------*\
+                | Push the dummy motherboard onto the controller list       |
+                \*---------------------------------------------------------*/
+                rgb_controllers.push_back(dummy_motherboard);
+            }
+            else if(type == "dram")
+            {
+                /*---------------------------------------------------------*\
+                | Create a dummy DRAM                                       |
+                \*---------------------------------------------------------*/
+                RGBController_Dummy* dummy_dram = new RGBController_Dummy();
+
+                dummy_dram->name                            = "Debug DRAM";
+                dummy_dram->type                            = DEVICE_TYPE_DRAM;
+                dummy_dram->description                     = "Debug DRAM Device";
+                dummy_dram->location                        = "Debug DRAM Location";
+                dummy_dram->version                         = "Debug DRAM Version";
+                dummy_dram->serial                          = "Debug DRAM Serial";
+
+                /*---------------------------------------------------------*\
+                | Create a direct mode for the dummy DRAM                   |
+                \*---------------------------------------------------------*/
+                mode dummy_dram_direct_mode;
+
+                dummy_dram_direct_mode.name                 = "Direct";
+                dummy_dram_direct_mode.value                = 0;
+                dummy_dram_direct_mode.flags                = MODE_FLAG_HAS_PER_LED_COLOR;
+                dummy_dram_direct_mode.color_mode           = MODE_COLORS_PER_LED;
+
+                dummy_dram->modes.push_back(dummy_dram_direct_mode);
+
+                /*---------------------------------------------------------*\
+                | Create a single zone/LED for the dummy DRAM               |
+                \*---------------------------------------------------------*/
+                zone dummy_dram_single_zone;
+
+                dummy_dram_single_zone.name                 = "Single Zone";
+                dummy_dram_single_zone.type                 = ZONE_TYPE_SINGLE;
+                dummy_dram_single_zone.leds_min             = 1;
+                dummy_dram_single_zone.leds_max             = 1;
+                dummy_dram_single_zone.leds_count           = 1;
+                dummy_dram_single_zone.matrix_map           = NULL;
+
+                dummy_dram->zones.push_back(dummy_dram_single_zone);
+
+                led dummy_dram_single_led;
+
+                dummy_dram_single_led.name                  = "Single LED";
+
+                dummy_dram->leds.push_back(dummy_dram_single_led);
+
+                /*---------------------------------------------------------*\
+                | Create a linear zone for the dummy DRAM                   |
+                \*---------------------------------------------------------*/
+                zone dummy_dram_linear_zone;
+
+                dummy_dram_linear_zone.name                 = "Linear Zone";
+                dummy_dram_linear_zone.type                 = ZONE_TYPE_LINEAR;
+                dummy_dram_linear_zone.leds_min             = 5;
+                dummy_dram_linear_zone.leds_max             = 5;
+                dummy_dram_linear_zone.leds_count           = 5;
+                dummy_dram_linear_zone.matrix_map           = NULL;
+
+                dummy_dram->zones.push_back(dummy_dram_linear_zone);
+
+                for(std::size_t led_idx = 0; led_idx < 5; led_idx++)
+                {
+                    led dummy_dram_linear_led;
+
+                    dummy_dram_linear_led.name              = "Linear LED " + std::to_string(led_idx);
+
+                    dummy_dram->leds.push_back(dummy_dram_linear_led);
+                }
+
+                dummy_dram->SetupColors();
+
+                /*---------------------------------------------------------*\
+                | Push the dummy DRAM onto the controller list              |
+                \*---------------------------------------------------------*/
+                rgb_controllers.push_back(dummy_dram);
+            }
+            else if(type == "gpu")
+            {
+                /*---------------------------------------------------------*\
+                | Create a dummy GPU                                        |
+                \*---------------------------------------------------------*/
+                RGBController_Dummy* dummy_gpu = new RGBController_Dummy();
+
+                dummy_gpu->name                             = "Debug GPU";
+                dummy_gpu->type                             = DEVICE_TYPE_GPU;
+                dummy_gpu->description                      = "Debug GPU Device";
+                dummy_gpu->location                         = "Debug GPU Location";
+                dummy_gpu->version                          = "Debug GPU Version";
+                dummy_gpu->serial                           = "Debug GPU Serial";
+
+                /*---------------------------------------------------------*\
+                | Create a direct mode for the dummy GPU                    |
+                \*---------------------------------------------------------*/
+                mode dummy_gpu_direct_mode;
+
+                dummy_gpu_direct_mode.name                  = "Direct";
+                dummy_gpu_direct_mode.value                 = 0;
+                dummy_gpu_direct_mode.flags                 = MODE_FLAG_HAS_PER_LED_COLOR;
+                dummy_gpu_direct_mode.color_mode            = MODE_COLORS_PER_LED;
+
+                dummy_gpu->modes.push_back(dummy_gpu_direct_mode);
+
+                /*---------------------------------------------------------*\
+                | Create a single zone/LED for the dummy GPU                |
+                \*---------------------------------------------------------*/
+                zone dummy_gpu_single_zone;
+
+                dummy_gpu_single_zone.name                  = "Single Zone";
+                dummy_gpu_single_zone.type                  = ZONE_TYPE_SINGLE;
+                dummy_gpu_single_zone.leds_min              = 1;
+                dummy_gpu_single_zone.leds_max              = 1;
+                dummy_gpu_single_zone.leds_count            = 1;
+                dummy_gpu_single_zone.matrix_map            = NULL;
+
+                dummy_gpu->zones.push_back(dummy_gpu_single_zone);
+
+                led dummy_gpu_single_led;
+
+                dummy_gpu_single_led.name                   = "Single LED";
+
+                dummy_gpu->leds.push_back(dummy_gpu_single_led);
+
+                /*---------------------------------------------------------*\
+                | Create a linear zone for the dummy GPU                    |
+                \*---------------------------------------------------------*/
+                zone dummy_gpu_linear_zone;
+
+                dummy_gpu_linear_zone.name                  = "Linear Zone";
+                dummy_gpu_linear_zone.type                  = ZONE_TYPE_LINEAR;
+                dummy_gpu_linear_zone.leds_min              = 15;
+                dummy_gpu_linear_zone.leds_max              = 15;
+                dummy_gpu_linear_zone.leds_count            = 15;
+                dummy_gpu_linear_zone.matrix_map            = NULL;
+
+                dummy_gpu->zones.push_back(dummy_gpu_linear_zone);
+
+                for(std::size_t led_idx = 0; led_idx < 15; led_idx++)
+                {
+                    led dummy_gpu_linear_led;
+
+                    dummy_gpu_linear_led.name               = "Linear LED " + std::to_string(led_idx);
+
+                    dummy_gpu->leds.push_back(dummy_gpu_linear_led);
+                }
+
+                dummy_gpu->SetupColors();
+
+                /*---------------------------------------------------------*\
+                | Push the dummy GPU onto the controller list               |
+                \*---------------------------------------------------------*/
+                rgb_controllers.push_back(dummy_gpu);
+            }
+            else if(type == "keyboard")
+            {
+                /*---------------------------------------------------------*\
+                | Create a dummy Keyboard                                   |
+                \*---------------------------------------------------------*/
+                RGBController_Dummy* dummy_keyboard = new RGBController_Dummy();
+
+                dummy_keyboard->name                             = "Debug Keyboard";
+                dummy_keyboard->type                             = DEVICE_TYPE_KEYBOARD;
+                dummy_keyboard->description                      = "Debug Keyboard Device";
+                dummy_keyboard->location                         = "Debug Keyboard Location";
+                dummy_keyboard->version                          = "Debug Keyboard Version";
+                dummy_keyboard->serial                           = "Debug Keyboard Serial";
+
+                /*---------------------------------------------------------*\
+                | Create a direct mode for the dummy GPU                    |
+                \*---------------------------------------------------------*/
+                mode dummy_gpu_direct_mode;
+
+                dummy_gpu_direct_mode.name                  = "Direct";
+                dummy_gpu_direct_mode.value                 = 0;
+                dummy_gpu_direct_mode.flags                 = MODE_FLAG_HAS_PER_LED_COLOR;
+                dummy_gpu_direct_mode.color_mode            = MODE_COLORS_PER_LED;
+
+                dummy_keyboard->modes.push_back(dummy_gpu_direct_mode);
+
+                /*---------------------------------------------------------*\
+                | Create a matrix zone for the debug Keyboard               |
+                \*---------------------------------------------------------*/
+                zone dummy_keyboard_matrix_zone;
+
+                dummy_keyboard_matrix_zone.name                  = "Keyboard Matrix Zone";
+                dummy_keyboard_matrix_zone.type                  = ZONE_TYPE_MATRIX;
+                dummy_keyboard_matrix_zone.leds_min              = 106;
+                dummy_keyboard_matrix_zone.leds_max              = 106;
+                dummy_keyboard_matrix_zone.leds_count            = 106;
+                dummy_keyboard_matrix_zone.matrix_map            = new matrix_map_type;
+                dummy_keyboard_matrix_zone.matrix_map->height    = 6;
+                dummy_keyboard_matrix_zone.matrix_map->width     = 23;
+                dummy_keyboard_matrix_zone.matrix_map->map       = (unsigned int*)&debug_keyboard_matrix_map;
+
+                dummy_keyboard->zones.push_back(dummy_keyboard_matrix_zone);
+
+                /*---------------------------------------------------------*\
+                | Create a linear zone for the dummy GPU                    |
+                \*---------------------------------------------------------*/
+                zone dummy_keyboard_linear_zone;
+
+                dummy_keyboard_linear_zone.name                  = "Linear Zone";
+                dummy_keyboard_linear_zone.type                  = ZONE_TYPE_LINEAR;
+                dummy_keyboard_linear_zone.leds_min              = 18;
+                dummy_keyboard_linear_zone.leds_max              = 18;
+                dummy_keyboard_linear_zone.leds_count            = 18;
+                dummy_keyboard_linear_zone.matrix_map            = NULL;
+
+                dummy_keyboard->zones.push_back(dummy_keyboard_linear_zone);
+
+                for(std::size_t led_idx = 0; led_idx < 124; led_idx++)
+                {
+                    led dummy_keyboard_led;
+                    dummy_keyboard_led.name = led_names[led_idx];
+                    dummy_keyboard->leds.push_back(dummy_keyboard_led);
+                }
+
+                dummy_keyboard->SetupColors();
+
+                /*---------------------------------------------------------*\
+                | Push the dummy Keyboard onto the controller list          |
+                \*---------------------------------------------------------*/
+                rgb_controllers.push_back(dummy_keyboard);
+            }
+        }
+    }
+
+}   /* DetectDebugControllers() */
+
+REGISTER_DETECTOR("Debug Controllers", DetectDebugControllers);
@@ -0,0 +1,193 @@
+/*-----------------------------------------*\
+|  DuckyKeyboardController.cpp              |
+|                                           |
+|  Driver for Ducky RGB keyboardlighting    |
+|  controller                               |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 7/4/2020    |
+\*-----------------------------------------*/
+
+#include <cstring>
+#include "DuckyKeyboardController.h"
+
+DuckyKeyboardController::DuckyKeyboardController(hid_device* dev_handle, const char* path)
+{
+    dev         = dev_handle;
+    location    = path;
+
+    SendInitialize();
+}
+
+DuckyKeyboardController::~DuckyKeyboardController()
+{
+    
+}
+
+std::string DuckyKeyboardController::GetDeviceLocation()
+{
+    return(location);
+}
+
+void DuckyKeyboardController::SendColors
+    (
+    unsigned char*  color_data,
+    unsigned int    color_data_size
+    )
+{
+    unsigned int    bytes_sent;
+    unsigned char*  color_data_ptr = color_data;
+
+    SendInitializeColorPacket();
+
+    for(int i = 0; i < 8; i++)
+    {
+        bytes_sent = SendColorDataPacket(i, color_data_ptr, color_data_size);
+
+        color_data_ptr += bytes_sent;
+        color_data_size -= bytes_sent;
+    }
+
+    SendTerminateColorPacket();
+}
+
+void DuckyKeyboardController::SendInitialize()
+{
+    char usb_buf[65];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Initialize Direct Mode packet                  |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]   = 0x00;
+    usb_buf[0x01]   = 0x41;
+    usb_buf[0x02]   = 0x01;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_write(dev, (unsigned char *)usb_buf, 65);
+}
+
+void DuckyKeyboardController::SendInitializeColorPacket()
+{
+    char usb_buf[65];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Initialize Color packet                        |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]   = 0x00;
+    usb_buf[0x01]   = 0x56;
+    usb_buf[0x02]   = 0x81;
+    usb_buf[0x05]   = 0x01;
+    usb_buf[0x09]   = 0x08;
+    usb_buf[0x0D]   = 0xAA;
+    usb_buf[0x0E]   = 0xAA;
+    usb_buf[0x0F]   = 0xAA;
+    usb_buf[0x10]   = 0xAA;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_write(dev, (unsigned char *)usb_buf, 65);
+}
+
+unsigned int DuckyKeyboardController::SendColorDataPacket
+    (
+    unsigned char   packet_id,
+    unsigned char*  color_data,
+    unsigned int    color_size
+    )
+{
+    unsigned int bytes_sent;
+    char usb_buf[65];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Color Data packet                              |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]   = 0x00;
+    usb_buf[0x01]   = 0x56;
+    usb_buf[0x02]   = 0x83;
+    usb_buf[0x03]   = packet_id;
+
+    if(packet_id == 0x00)
+    {
+        usb_buf[0x05]   = 0x01;
+        usb_buf[0x09]   = 0x80;
+        usb_buf[0x0A]   = 0x01;
+        usb_buf[0x0C]   = 0xC1;
+        usb_buf[0x11]   = 0xFF;
+        usb_buf[0x12]   = 0xFF;
+        usb_buf[0x13]   = 0xFF;
+        usb_buf[0x14]   = 0xFF;
+    }
+
+    /*-----------------------------------------------------*\
+    | Copy in color data                                    |
+    \*-----------------------------------------------------*/
+    if(packet_id == 0x00)
+    {
+        bytes_sent = 65 - 0x19;
+
+        if(color_size < bytes_sent)
+        {
+            bytes_sent = color_size;
+        }
+
+        memcpy(&usb_buf[0x19], color_data, bytes_sent);
+    }
+    else
+    {
+        bytes_sent = 65 - 0x05;
+
+        if(color_size < bytes_sent)
+        {
+            bytes_sent = color_size;
+        }
+
+        memcpy(&usb_buf[0x05], color_data, bytes_sent);
+    }
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_write(dev, (unsigned char *)usb_buf, 65);
+
+    return(bytes_sent);
+}
+
+void DuckyKeyboardController::SendTerminateColorPacket()
+{
+    char usb_buf[65];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Terminate Color packet                         |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]   = 0x00;
+    usb_buf[0x01]   = 0x51;
+    usb_buf[0x02]   = 0x28;
+    usb_buf[0x05]   = 0xFF;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_write(dev, (unsigned char *)usb_buf, 65);
+}
@@ -0,0 +1,44 @@
+/*-----------------------------------------*\
+|  DuckyKeyboardController.h                |
+|                                           |
+|  Definitions and types for Ducky RGB      |
+|  keyboard lighting controller             |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 7/4/2020    |
+\*-----------------------------------------*/
+
+#include "RGBController.h"
+
+#include <string>
+#include <hidapi/hidapi.h>
+
+#pragma once
+
+class DuckyKeyboardController
+{
+public:
+    DuckyKeyboardController(hid_device* dev_handle, const char* path);
+    ~DuckyKeyboardController();
+
+    std::string GetDeviceLocation();
+
+    void SendColors
+            (
+            unsigned char*  color_data,
+            unsigned int    color_data_size
+            );
+
+private:
+    hid_device*             dev;
+    std::string             location;
+
+    void SendInitialize();
+    void SendInitializeColorPacket();
+    unsigned int SendColorDataPacket
+        (
+        unsigned char   packet_id,
+        unsigned char*  color_data,
+        unsigned int    color_size
+        );
+    void SendTerminateColorPacket();
+};
@@ -0,0 +1,84 @@
+#include "Detector.h"
+#include "DuckyKeyboardController.h"
+#include "RGBController.h"
+#include "RGBController_DuckyKeyboard.h"
+#include <vector>
+#include <hidapi/hidapi.h>
+
+/*-----------------------------------------------------*\
+| Ducky vendor ID                                       |
+\*-----------------------------------------------------*/
+#define DUCKY_VID                       0x04D9
+
+/*-----------------------------------------------------*\
+| Keyboard product IDs                                  |
+\*-----------------------------------------------------*/
+#define DUCKY_SHINE_7_ONE_2_RGB_PID     0x0348
+#define DUCKY_ONE_2_RGB_TKL_PID         0x0356
+
+typedef struct
+{
+    unsigned short  usb_vid;
+    unsigned short  usb_pid;
+    unsigned char   usb_interface;
+    const char *    name;
+} ducky_device;
+
+#define DUCKY_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ]))
+
+static const ducky_device device_list[] =
+{
+    /*-----------------------------------------------------------------------------------------------------*\
+    | Keyboards                                                                                             |
+    \*-----------------------------------------------------------------------------------------------------*/
+    { DUCKY_VID,            DUCKY_SHINE_7_ONE_2_RGB_PID,        1,      "Ducky Shine 7/Ducky One 2 RGB"     },
+    { DUCKY_VID,            DUCKY_ONE_2_RGB_TKL_PID,            1,      "Ducky One 2 RGB TKL"               },
+};
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectDuckyKeyboardControllers                                                         *
+*                                                                                          *
+*       Tests the USB address to see if a Ducky RGB Keyboard controller exists there.      *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectDuckyKeyboardControllers(std::vector<RGBController*>& rgb_controllers)
+{
+    hid_device_info* info;
+    hid_device* dev;
+
+    hid_init();
+
+    for(std::size_t device_idx = 0; device_idx < DUCKY_NUM_DEVICES; device_idx++)
+    {
+        dev = NULL;
+
+        info = hid_enumerate(device_list[device_idx].usb_vid, device_list[device_idx].usb_pid);
+
+        //Look for Ducky RGB Peripheral
+        while(info)
+        {
+            if((info->vendor_id == device_list[device_idx].usb_vid)
+            &&(info->product_id == device_list[device_idx].usb_pid)
+            &&(info->interface_number == device_list[device_idx].usb_interface))
+            {
+                dev = hid_open_path(info->path);
+
+                if( dev )
+                {
+                    DuckyKeyboardController* controller = new DuckyKeyboardController(dev, info->path);
+
+                    RGBController_DuckyKeyboard* rgb_controller = new RGBController_DuckyKeyboard(controller);
+
+                    rgb_controller->name = device_list[device_idx].name;
+                    
+                    rgb_controllers.push_back(rgb_controller);
+                }
+            }
+            info = info->next;
+        }
+    }
+}   /* DetectDuckyKeyboardControllers() */
+
+REGISTER_DETECTOR("Ducky Keyboard", DetectDuckyKeyboardControllers);
@@ -0,0 +1,279 @@
+/*-----------------------------------------*\
+|  RGBController_DuckyKeyboard.cpp          |
+|                                           |
+|  Generic RGB Interface for Ducky RGB      |
+|  keyboard devices                         |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 7/4/2020    |
+\*-----------------------------------------*/
+
+#include "RGBController_DuckyKeyboard.h"
+
+//0xFFFFFFFF indicates an unused entry in matrix
+#define NA  0xFFFFFFFF
+
+static unsigned int matrix_map[6][23] =
+    { {   0,  NA,  12,  18,  24,  30,  NA,  42,  48,  54,  60,  NA,  66,  72,  78,  84,  90,  96, 102, 108, 114, 120, 126 },
+      {   1,   7,  13,  19,  25,  31,  37,  43,  49,  55,  61,  NA,  67,  73,  85,  NA,  91,  97, 103, 109, 115, 121, 127 },
+      {   2,  NA,   8,  14,  20,  26,  NA,  32,  38,  44,  50,  56,  62,  68,  74,  86,  92,  98, 104, 110, 116, 122, 128 },
+      {   3,  NA,   9,  15,  21,  27,  NA,  33,  39,  45,  51,  57,  63,  69,  87,  NA,  NA,  NA,  NA, 111, 117, 123,  NA },
+      {   4,  NA,  16,  22,  28,  34,  NA,  40,  NA,  46,  52,  58,  64,  70,  82,  NA,  NA, 100,  NA, 112, 118, 124, 131 },
+      {   5,  11,  17,  NA,  NA,  NA,  NA,  41,  NA,  NA,  NA,  NA,  65,  77,  83,  89,  95, 101, 107, 113,  NA, 125,  NA } };
+
+static const char* zone_names[] =
+{
+    "Keyboard"
+};
+
+static zone_type zone_types[] =
+{
+    ZONE_TYPE_MATRIX,
+};
+
+static const unsigned int zone_sizes[] =
+{
+    132
+};
+
+static const char *led_names[] =
+{
+    "Key: Escape",
+    "Key: `",
+    "Key: Tab",
+    "Key: Caps Lock",
+    "Key: Left Shift",
+    "Key: Left Control",
+    "Unused",
+    "Key: 1",
+    "Key: Q",
+    "Key: A",
+    "Unused",
+    "Key: Left Windows",
+    "Key: F1",
+    "Key: 2",
+    "Key: W",
+    "Key: S",
+    "Key: Z",
+    "Key: Left Alt",
+    "Key: F2",
+    "Key: 3",
+    "Key: E",
+    "Key: D",
+    "Key: X",
+    "Unused",
+    "Key: F3",
+    "Key: 4",
+    "Key: R",
+    "Key: F",
+    "Key: C",
+    "Unused",
+    "Key: F4",
+    "Key: 5",
+    "Key: T",
+    "Key: G",
+    "Key: V",
+    "Unused",
+    "Unused",
+    "Key: 6",
+    "Key: Y",
+    "Key: H",
+    "Key: B",
+    "Key: Space",
+    "Key: F5",
+    "Key: 7",
+    "Key: U",
+    "Key: J",
+    "Key: N",
+    "Unused",
+    "Key: F6",
+    "Key: 8",
+    "Key: I",
+    "Key: K",
+    "Key: M",
+    "Unused",
+    "Key: F7",
+    "Key: 9",
+    "Key: O",
+    "Key: L",
+    "Key: ,",
+    "Unused",
+    "Key: F8",
+    "Key: 0",
+    "Key: P",
+    "Key: ;",
+    "Key: .",
+    "Key: Right Alt",
+    "Key: F9",
+    "Key: -",
+    "Key: [",
+    "Key: '",
+    "Key: /",
+    "Unused",
+    "Key: F10",
+    "Key: =",
+    "Key: ]",
+    "Unused",
+    "Unused",
+    "Key: Right Windows",
+    "Key: F11",
+    "Unused",
+    "Unused",
+    "Unused",
+    "Key: Right Shift",
+    "Key: Right Fn",
+    "Key: F12",
+    "Key: Backspace",
+    "Key: \\ (ANSI)",
+    "Key: Enter",
+    "Unused",
+    "Key: Right Control",
+    "Key: Print Screen",
+    "Key: Insert",
+    "Key: Delete",
+    "Unused",
+    "Unused",
+    "Key: Left Arrow",
+    "Key: Scroll Lock",
+    "Key: Home",
+    "Key: End",
+    "Unused",
+    "Key: Up Arrow",
+    "Key: Down Arrow",
+    "Key: Pause/Break",
+    "Key: Page Up",
+    "Key: Page Down",
+    "Unused",
+    "Unused",
+    "Key: Right Arrow",
+    "Key: Calculator",
+    "Key: Num Lock",
+    "Key: Number Pad 7",
+    "Key: Number Pad 4",
+    "Key: Number Pad 1",
+    "Key: Number Pad 0",
+    "Key: Media Mute",
+    "Key: Number Pad /",
+    "Key: Number Pad 8",
+    "Key: Number Pad 5",
+    "Key: Number Pad 2",
+    "Unused",
+    "Key: Media Volume Down",
+    "Key: Number Pad *",
+    "Key: Number Pad 9",
+    "Key: Number Pad 6",
+    "Key: Number Pad 3",
+    "Key: Number Pad .",
+    "Key: Media Volume Up",
+    "Key: Number Pad -",
+    "Key: Number Pad +",
+    "Unused",
+    "Unused",
+    "Key: Number Pad Enter",
+};
+
+RGBController_DuckyKeyboard::RGBController_DuckyKeyboard(DuckyKeyboardController* ducky_ptr)
+{
+    ducky = ducky_ptr;
+
+    name        = "Ducky Keyboard Device";
+    type        = DEVICE_TYPE_KEYBOARD;
+    description = "Ducky Keyboard Device";
+    location    = ducky->GetDeviceLocation();
+
+    mode Direct;
+    Direct.name       = "Direct";
+    Direct.value      = 0xFFFF;
+    Direct.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
+    SetupZones();
+}
+
+RGBController_DuckyKeyboard::~RGBController_DuckyKeyboard()
+{
+    /*---------------------------------------------------------*\
+    | Delete the matrix map                                     |
+    \*---------------------------------------------------------*/
+    for(unsigned int zone_index = 0; zone_index < zones.size(); zone_index++)
+    {
+        if(zones[zone_index].matrix_map != NULL)
+        {
+            delete zones[zone_index].matrix_map;
+        }
+    }
+}
+
+void RGBController_DuckyKeyboard::SetupZones()
+{
+    /*---------------------------------------------------------*\
+    | Set up zones                                              |
+    \*---------------------------------------------------------*/
+    unsigned int total_led_count = 0;
+    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.matrix_map         = new matrix_map_type;
+        new_zone.matrix_map->height = 6;
+        new_zone.matrix_map->width  = 23;
+        new_zone.matrix_map->map    = (unsigned int *)&matrix_map;
+        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();
+}
+
+void RGBController_DuckyKeyboard::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+    
+void RGBController_DuckyKeyboard::DeviceUpdateLEDs()
+{
+    unsigned char colordata[155*3];
+    
+    for(std::size_t color_idx = 0; color_idx < colors.size(); color_idx++)
+    {
+        colordata[(color_idx*3)+0] = RGBGetRValue(colors[color_idx]);
+        colordata[(color_idx*3)+1] = RGBGetGValue(colors[color_idx]);
+        colordata[(color_idx*3)+2] = RGBGetBValue(colors[color_idx]);
+    }
+
+    ducky->SendColors(colordata, sizeof(colordata));
+}
+
+void RGBController_DuckyKeyboard::UpdateZoneLEDs(int /*zone*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_DuckyKeyboard::UpdateSingleLED(int /*led*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_DuckyKeyboard::SetCustomMode()
+{
+
+}
+
+void RGBController_DuckyKeyboard::DeviceUpdateMode()
+{
+
+}
@@ -0,0 +1,33 @@
+/*-----------------------------------------*\
+|  RGBController_DuckyKeyboard.h            |
+|                                           |
+|  Generic RGB Interface for Ducky RGB      |
+|  keyboard devices                         |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 7/4/2020    |
+\*-----------------------------------------*/
+
+#pragma once
+#include "RGBController.h"
+#include "DuckyKeyboardController.h"
+
+class RGBController_DuckyKeyboard : public RGBController
+{
+public:
+    RGBController_DuckyKeyboard(DuckyKeyboardController* ducky_ptr);
+    ~RGBController_DuckyKeyboard();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+    
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        SetCustomMode();
+    void        DeviceUpdateMode();
+
+private:
+    DuckyKeyboardController*    ducky;
+};
@@ -0,0 +1,238 @@
+#include "Detector.h"
+#include "RGBController.h"
+#include "RGBController_E131.h"
+#include "SettingsManager.h"
+#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <fcntl.h>
+#include <string.h>
+#include <fstream>
+#include <iostream>
+#include <string>
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectE131Controllers                                                                  *
+*                                                                                          *
+*       Detect devices supported by the E131 driver                                        *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectE131Controllers(std::vector<RGBController*> &rgb_controllers)
+{
+    json                e131_settings;
+
+    std::vector<std::vector<E131Device>> device_lists; 
+	E131Device dev;
+
+    /*-------------------------------------------------*\
+    | Get E1.31 settings from settings manager          |
+    \*-------------------------------------------------*/
+    e131_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_E131Devices");
+
+    /*-------------------------------------------------*\
+    | If the E1.31 settings contains devices, process   |
+    \*-------------------------------------------------*/
+    if(e131_settings.contains("devices"))
+    {
+        for(unsigned int device_idx = 0; device_idx < e131_settings["devices"].size(); device_idx++)
+        {
+            /*-------------------------------------------------*\
+            | Clear E1.31 device data                           |
+            \*-------------------------------------------------*/
+            dev.name           = "";
+            dev.type           = ZONE_TYPE_SINGLE;
+            dev.num_leds       = 0;
+            dev.rgb_order      = E131_RGB_ORDER_RBG;
+            dev.matrix_order   = E131_MATRIX_ORDER_HORIZONTAL_TOP_LEFT;
+            dev.matrix_width   = 0;
+            dev.matrix_height  = 0;
+            dev.start_channel  = 1;
+            dev.start_universe = 1;
+
+            if(e131_settings["devices"][device_idx].contains("name"))
+            {
+                dev.name = e131_settings["devices"][device_idx]["name"];
+            }
+
+            if(e131_settings["devices"][device_idx].contains("num_leds"))
+            {
+                dev.num_leds = e131_settings["devices"][device_idx]["num_leds"];
+            }
+
+            if(e131_settings["devices"][device_idx].contains("start_universe"))
+            {
+                dev.start_universe = e131_settings["devices"][device_idx]["start_universe"];
+            }
+
+            if(e131_settings["devices"][device_idx].contains("start_channel"))
+            {
+                dev.start_channel = e131_settings["devices"][device_idx]["start_channel"];
+            }
+
+            if(e131_settings["devices"][device_idx].contains("matrix_order"))
+            {
+                std::string matrix_order_val = e131_settings["devices"][device_idx]["matrix_order"];
+
+                if(matrix_order_val == "HORIZONTAL_TOP_LEFT")
+                {
+                    dev.matrix_order = E131_MATRIX_ORDER_HORIZONTAL_TOP_LEFT;
+                }
+                else if(matrix_order_val == "HORIZONTAL_TOP_RIGHT")
+                {
+                    dev.matrix_order = E131_MATRIX_ORDER_HORIZONTAL_TOP_RIGHT;
+                }
+                else if(matrix_order_val == "HORIZONTAL_BOTTOM_LEFT")
+                {
+                    dev.matrix_order = E131_MATRIX_ORDER_HORIZONTAL_BOTTOM_LEFT;
+                }
+                else if(matrix_order_val == "HORIZONTAL_BOTTOM_RIGHT")
+                {
+                    dev.matrix_order = E131_MATRIX_ORDER_HORIZONTAL_BOTTOM_RIGHT;
+                }
+                else if(matrix_order_val == "VERTICAL_TOP_LEFT")
+                {
+                    dev.matrix_order = E131_MATRIX_ORDER_VERTICAL_TOP_LEFT;
+                }
+                else if(matrix_order_val == "VERTICAL_TOP_RIGHT")
+                {
+                    dev.matrix_order = E131_MATRIX_ORDER_VERTICAL_TOP_RIGHT;
+                }
+                else if(matrix_order_val == "VERTICAL_BOTTOM_LEFT")
+                {
+                    dev.matrix_order = E131_MATRIX_ORDER_VERTICAL_BOTTOM_LEFT;
+                }
+                else if(matrix_order_val == "VERTICAL_BOTTOM_RIGHT")
+                {
+                    dev.matrix_order = E131_MATRIX_ORDER_VERTICAL_BOTTOM_RIGHT;
+                }
+                else
+                {
+                    dev.matrix_order = e131_settings["devices"][device_idx]["matrix_order"];
+                }
+            }
+
+            if(e131_settings["devices"][device_idx].contains("rgb_order"))
+            {
+                std::string rgb_order_val = e131_settings["devices"][device_idx]["rgb_order"];
+
+                if(rgb_order_val == "RGB")
+                {
+                    dev.rgb_order = E131_RGB_ORDER_RGB;
+                }
+                else if(rgb_order_val == "RBG")
+                {
+                    dev.rgb_order = E131_RGB_ORDER_RBG;
+                }
+                else if(rgb_order_val == "GRB")
+                {
+                    dev.rgb_order = E131_RGB_ORDER_GRB;
+                }
+                else if(rgb_order_val == "GBR")
+                {
+                    dev.rgb_order = E131_RGB_ORDER_GBR;
+                }
+                else if(rgb_order_val == "BRG")
+                {
+                    dev.rgb_order = E131_RGB_ORDER_BGR;
+                }
+                else if(rgb_order_val == "BGR")
+                {
+                    dev.rgb_order = E131_RGB_ORDER_BGR;
+                }
+                else
+                {
+                    dev.rgb_order = e131_settings["devices"][device_idx]["rgb_order"];
+                }
+            }
+
+            if(e131_settings["devices"][device_idx].contains("matrix_width"))
+            {
+                dev.matrix_width = e131_settings["devices"][device_idx]["matrix_width"];
+            }
+
+            if(e131_settings["devices"][device_idx].contains("matrix_height"))
+            {
+                dev.matrix_height = e131_settings["devices"][device_idx]["matrix_height"];
+            }
+            
+            if(e131_settings["devices"][device_idx].contains("type"))
+            {
+                std::string type_val = e131_settings["devices"][device_idx]["type"];
+
+                if(type_val == "SINGLE")
+                {
+                    dev.type = ZONE_TYPE_SINGLE;
+                }
+                else if(type_val == "LINEAR")
+                {
+                    dev.type = ZONE_TYPE_LINEAR;
+                }
+                else if(type_val == "MATRIX")
+                {
+                    dev.type = ZONE_TYPE_MATRIX;
+                }
+                else
+                {
+                    dev.type = e131_settings["devices"][device_idx]["type"];
+                }
+            }
+
+            /*---------------------------------------------------------*\
+            | Determine whether to create a new list or add this device |
+            | to an existing list.  A device is added to an existing    |
+            | list if both devices share one or more universes for the  |
+            | same output destination                                   |
+            \*---------------------------------------------------------*/
+            bool device_added_to_existing_list = false;
+
+            for(unsigned int list_idx = 0; list_idx < device_lists.size(); list_idx++)
+            {
+                for(unsigned int device_idx = 0; device_idx < device_lists[list_idx].size(); device_idx++)
+                {
+                    /*---------------------------------------------------------*\
+                    | Check if any universes used by this new device exist in   |
+                    | the existing device.  If so, add the new device to the    |
+                    | existing list.                                            |
+                    \*---------------------------------------------------------*/
+                    if(dev.start_universe == device_lists[list_idx][device_idx].start_universe)
+                    {
+                        device_lists[list_idx].push_back(dev);
+                        device_added_to_existing_list = true;
+                        break;
+                    }
+                }
+
+                if(device_added_to_existing_list)
+                {
+                    break;
+                }
+            }
+
+            /*---------------------------------------------------------*\
+            | If the device did not overlap with existing devices,      |
+            | create a new list for it                                  |
+            \*---------------------------------------------------------*/
+            if(!device_added_to_existing_list)
+            {
+                std::vector<E131Device> new_list;
+
+                new_list.push_back(dev);
+
+                device_lists.push_back(new_list);
+            }
+        }
+
+        for(unsigned int list_idx = 0; list_idx < device_lists.size(); list_idx++)
+        {
+            RGBController_E131* rgb_controller;
+            rgb_controller = new RGBController_E131(device_lists[list_idx]);
+            rgb_controllers.push_back(rgb_controller);
+        }
+    }
+
+}   /* DetectE131Controllers() */
+
+REGISTER_DETECTOR("E1.31", DetectE131Controllers);
@@ -0,0 +1,424 @@
+/*-----------------------------------------*\
+|  RGBController_LEDStrip.cpp               |
+|                                           |
+|  Generic RGB Interface for OpenAuraSDK    |
+|  E1.31 Streaming ACN interface            |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 10/18/2019  |
+\*-----------------------------------------*/
+
+#include "RGBController_E131.h"
+#include <e131.h>
+#include <math.h>
+
+using namespace std::chrono_literals;
+
+RGBController_E131::RGBController_E131(std::vector<E131Device> device_list)
+{
+    devices = device_list;
+
+    name        = "E1.31 Device Group";
+    type        = DEVICE_TYPE_LEDSTRIP;
+    description = "E1.31 Streaming ACN Device";
+    location    = "E1.31: ";
+
+    /*-----------------------------------------*\
+    | If this controller only represents a      |
+    | single device, use the device name for the|
+    | controller name                           |
+    \*-----------------------------------------*/
+    if(devices.size() == 1)
+    {
+        name    = devices[0].name;
+    }
+
+    /*-----------------------------------------*\
+    | Append the destination address to the     |
+    | location field (multicast only for now)   |
+    \*-----------------------------------------*/
+    location   += "Multicast, ";
+
+    /*-----------------------------------------*\
+    | Calculate universe list                   |
+    | Use this to fill in the location field    |
+    \*-----------------------------------------*/
+    std::vector<unsigned int> universe_list;
+
+    for(unsigned int device_idx = 0; device_idx < devices.size(); device_idx++)
+    {
+        unsigned int total_universes = ceil( ( ( devices[device_idx].num_leds * 3 ) + devices[device_idx].start_channel ) / 512.0f );
+
+        for(unsigned int univ_idx = 0; univ_idx < total_universes; univ_idx++)
+        {
+            bool found = false;
+
+            for(unsigned int univ_list_idx = 0; univ_list_idx < universe_list.size(); univ_list_idx++)
+            {
+                if((devices[device_idx].start_universe + univ_idx) == universe_list[univ_list_idx])
+                {
+                    found = true;
+                    break;
+                }
+            }
+
+            if(!found)
+            {
+                universe_list.push_back(devices[device_idx].start_universe + univ_idx);
+            }
+        }
+    }
+
+    /*-----------------------------------------*\
+    | Append "Universe" and make plural if there|
+    | are multiple universes in use             |
+    \*-----------------------------------------*/
+    location   += "Universe";
+
+    if(universe_list.size() > 1)
+    {
+        location += "s ";
+    }
+    else
+    {
+        location += " ";
+    }
+
+    /*-----------------------------------------*\
+    | Append comma separated list of universes  |
+    \*-----------------------------------------*/
+    for(unsigned int univ_list_idx = 0; univ_list_idx < universe_list.size(); univ_list_idx++)
+    {
+        location += std::to_string(universe_list[univ_list_idx]);
+        
+        if(univ_list_idx < (universe_list.size() - 1))
+        {
+            location += ", ";
+        }
+    }
+
+    /*-----------------------------------------*\
+    | Set up modes                              |
+    \*-----------------------------------------*/
+    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);
+
+    /*-----------------------------------------*\
+    | Create E1.31 socket                       |
+    \*-----------------------------------------*/
+    sockfd = e131_socket();
+    
+    keepalive_delay = 0ms;
+
+    SetupZones();
+
+    for (std::size_t device_idx = 0; device_idx < devices.size(); device_idx++)
+    {
+        /*-----------------------------------------*\
+        | Update keepalive delay                    |
+        \*-----------------------------------------*/
+        if(devices[device_idx].keepalive_time > 0)
+        {
+            if(keepalive_delay.count() == 0 || keepalive_delay.count() > devices[device_idx].keepalive_time)
+            {
+                keepalive_delay = std::chrono::milliseconds(devices[device_idx].keepalive_time);
+            }
+        }
+
+        /*-----------------------------------------*\
+        | Add Universes                             |
+        \*-----------------------------------------*/
+        unsigned int total_universes = ceil( ( ( devices[device_idx].num_leds * 3 ) + devices[device_idx].start_channel ) / 512.0f );
+
+        for (unsigned int univ_idx = 0; univ_idx < total_universes; univ_idx++)
+        {
+            unsigned int universe = devices[device_idx].start_universe + univ_idx;
+            bool universe_exists = false;
+
+            for (std::size_t pkt_idx = 0; pkt_idx < packets.size(); pkt_idx++)
+            {
+                if(universes[pkt_idx] == universe)
+                {
+                    universe_exists = true;
+                }
+            }
+
+            if(!universe_exists)
+            {
+                e131_packet_t   packet;
+                e131_addr_t     dest_addr;
+
+                e131_pkt_init(&packet, universe, 512);
+                e131_multicast_dest(&dest_addr, universe, E131_DEFAULT_PORT);
+
+                packets.push_back(packet);
+                universes.push_back(universe);
+                dest_addrs.push_back(dest_addr);
+            }
+        }
+
+        /*-----------------------------------------*\
+        | Generate matrix maps                      |
+        \*-----------------------------------------*/
+        if(devices[device_idx].type == ZONE_TYPE_MATRIX)
+        {
+            unsigned int led_idx = 0;
+            matrix_map_type * new_map = new matrix_map_type;
+
+            new_map->width = devices[device_idx].matrix_width;
+            new_map->height = devices[device_idx].matrix_height;
+            new_map->map = new unsigned int[devices[device_idx].matrix_width * devices[device_idx].matrix_height];
+
+            switch(devices[device_idx].matrix_order)
+            {
+                case E131_MATRIX_ORDER_HORIZONTAL_TOP_LEFT:
+                    for(unsigned int y = 0; y < new_map->height; y++)
+                    {
+                        for(unsigned int x = 0; x < new_map->width; x++)
+                        {
+                            new_map->map[(y * new_map->width) + x] = led_idx;
+                            led_idx++;
+                        }
+                    }
+                    break;
+                case E131_MATRIX_ORDER_HORIZONTAL_TOP_RIGHT:
+                    for(unsigned int y = 0; y < new_map->height; y++)
+                    {
+                        for(int x = new_map->width - 1; x >= 0; x--)
+                        {
+                            new_map->map[(y * new_map->width) + x] = led_idx;
+                            led_idx++;
+                        }
+                    }
+                    break;
+                case E131_MATRIX_ORDER_HORIZONTAL_BOTTOM_LEFT:
+                    for(int y = new_map->height; y >= 0; y--)
+                    {
+                        for(unsigned int x = 0; x < new_map->width; x++)
+                        {
+                            new_map->map[(y * new_map->width) + x] = led_idx;
+                            led_idx++;
+                        }
+                    }
+                    break;
+                case E131_MATRIX_ORDER_HORIZONTAL_BOTTOM_RIGHT:
+                    for(int y = new_map->height; y >= 0; y--)
+                    {
+                        for(int x = new_map->width - 1; x >= 0; x--)
+                        {
+                            new_map->map[(y * new_map->width) + x] = led_idx;
+                            led_idx++;
+                        }
+                    }
+                    break;
+                case E131_MATRIX_ORDER_VERTICAL_TOP_LEFT:
+                    for(unsigned int x = 0; x < new_map->width; x++)
+                    {
+                        for(unsigned int y = 0; y < new_map->height; y++)
+                        {
+                            new_map->map[(y * new_map->width) + x] = led_idx;
+                            led_idx++;
+                        }
+                    }
+                    break;
+                case E131_MATRIX_ORDER_VERTICAL_TOP_RIGHT:
+                    for(int x = new_map->width - 1; x >= 0; x--)
+                    {
+                        for(unsigned int y = 0; y < new_map->height; y++)
+                        {
+                            new_map->map[(y * new_map->width) + x] = led_idx;
+                            led_idx++;
+                        }
+                    }
+                    break;
+                case E131_MATRIX_ORDER_VERTICAL_BOTTOM_LEFT:
+                    for(unsigned int x = 0; x < new_map->width; x++)
+                    {
+                        for(int y = new_map->height - 1; y >= 0; y--)
+                        {
+                            new_map->map[(y * new_map->width) + x] = led_idx;
+                            led_idx++;
+                        }
+                    }
+                    break;
+                case E131_MATRIX_ORDER_VERTICAL_BOTTOM_RIGHT:
+                    for(int x = new_map->width - 1; x >= 0; x--)
+                    {
+                        for(int y = new_map->height - 1; y >= 0; y--)
+                        {
+                            new_map->map[(y * new_map->width) + x] = led_idx;
+                            led_idx++;
+                        }
+                    }
+                    break;
+            }
+            zones[device_idx].matrix_map = new_map;
+        }
+	}
+
+    if(keepalive_delay.count() > 0)
+    {
+        KeepaliveThread = new std::thread(&RGBController_E131::KeepaliveThreadFunction, this);
+    }
+}
+
+RGBController_E131::~RGBController_E131()
+{
+    /*---------------------------------------------------------*\
+    | Delete the matrix map                                     |
+    \*---------------------------------------------------------*/
+    for(unsigned int zone_index = 0; zone_index < zones.size(); zone_index++)
+    {
+        if(zones[zone_index].matrix_map != NULL)
+        {
+            if(zones[zone_index].matrix_map->map != NULL)
+            {
+                delete zones[zone_index].matrix_map->map;
+            }
+
+            delete zones[zone_index].matrix_map;
+        }
+    }
+}
+
+void RGBController_E131::SetupZones()
+{
+    /*-----------------------------------------*\
+    | Add Zones                                 |
+    \*-----------------------------------------*/
+    for(std::size_t zone_idx = 0; zone_idx < devices.size(); zone_idx++)
+    {
+        zone led_zone;
+        led_zone.name           = devices[zone_idx].name;
+        led_zone.type           = devices[zone_idx].type;
+        led_zone.leds_min       = devices[zone_idx].num_leds;
+        led_zone.leds_max       = devices[zone_idx].num_leds;
+        led_zone.leds_count     = devices[zone_idx].num_leds;
+        led_zone.matrix_map     = NULL;
+
+        zones.push_back(led_zone);
+    }
+
+    /*-----------------------------------------*\
+    | Add LEDs                                  |
+    \*-----------------------------------------*/
+    for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
+    {
+        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 + " LED ";
+            new_led.name.append(std::to_string(led_idx));
+
+            leds.push_back(new_led);
+        }
+    }
+
+    SetupColors();
+}
+
+void RGBController_E131::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_E131::DeviceUpdateLEDs()
+{
+    int color_idx = 0;
+
+    last_update_time = std::chrono::steady_clock::now();
+    
+    for(std::size_t device_idx = 0; device_idx < devices.size(); device_idx++)
+    {
+        unsigned int total_universes = ceil( ( ( devices[device_idx].num_leds * 3 ) + devices[device_idx].start_channel ) / 512.0f );
+        unsigned int channel_idx = devices[device_idx].start_channel;
+        unsigned int led_idx = 0;
+        unsigned int rgb_idx = 0;
+        bool         done = false;
+
+        for (unsigned int univ_idx = 0; univ_idx < total_universes; univ_idx++)
+        {
+            unsigned int universe = devices[device_idx].start_universe + univ_idx;
+
+            for(std::size_t packet_idx = 0; packet_idx < packets.size(); packet_idx++)
+            {
+                if(!done && (universes[packet_idx] == universe))
+                {
+                    while(!done && (channel_idx <= 512))
+                    {
+                        switch(rgb_idx)
+                        {
+                            case 0:
+                                packets[packet_idx].dmp.prop_val[channel_idx] = RGBGetRValue( colors[color_idx] );
+                                rgb_idx = 1;
+                                break;
+                            case 1:
+                                packets[packet_idx].dmp.prop_val[channel_idx] = RGBGetGValue( colors[color_idx] );
+                                rgb_idx = 2;
+                                break;
+                            case 2:
+                                packets[packet_idx].dmp.prop_val[channel_idx] = RGBGetBValue( colors[color_idx] );
+                                rgb_idx = 0;
+                                led_idx++;
+                                color_idx++;
+                                break;
+                        }
+
+                        if(led_idx >= devices[device_idx].num_leds)
+                        {
+                            done = true;
+                        }
+
+                        channel_idx++;
+                    }
+                }
+            }
+
+            channel_idx = 1;
+        }
+    }
+
+    for(std::size_t packet_idx = 0; packet_idx < packets.size(); packet_idx++)
+    {
+        e131_send(sockfd, &packets[packet_idx], &dest_addrs[packet_idx]);
+        packets[packet_idx].frame.seq_number++;
+    }
+}
+
+void RGBController_E131::UpdateZoneLEDs(int /*zone*/)
+{
+	DeviceUpdateLEDs();
+}
+
+void RGBController_E131::UpdateSingleLED(int /*led*/)
+{
+	DeviceUpdateLEDs();
+}
+
+void RGBController_E131::SetCustomMode()
+{
+
+}
+
+void RGBController_E131::DeviceUpdateMode()
+{
+
+}
+
+void RGBController_E131::KeepaliveThreadFunction()
+{
+    while(1)
+    {
+        if((std::chrono::steady_clock::now() - last_update_time) > ( keepalive_delay * 0.95f ) )
+        {
+            UpdateLEDs();
+        }
+        std::this_thread::sleep_for(keepalive_delay / 2);
+    }
+}
@@ -0,0 +1,84 @@
+/*-----------------------------------------*\
+|  RGBController_E131.h                     |
+|                                           |
+|  Generic RGB Interface for OpenAuraSDK    |
+|  E1.31 Streaming ACN interface            |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 10/18/2019  |
+\*-----------------------------------------*/
+
+#pragma once
+#include "RGBController.h"
+#include <e131.h>
+#include <chrono>
+#include <thread>
+
+typedef unsigned int e131_rgb_order;
+
+enum
+{
+    E131_RGB_ORDER_RGB,
+    E131_RGB_ORDER_RBG,
+    E131_RGB_ORDER_GRB,
+    E131_RGB_ORDER_GBR,
+    E131_RGB_ORDER_BRG,
+    E131_RGB_ORDER_BGR
+};
+
+enum
+{
+    E131_MATRIX_ORDER_HORIZONTAL_TOP_LEFT,
+    E131_MATRIX_ORDER_HORIZONTAL_TOP_RIGHT,
+    E131_MATRIX_ORDER_HORIZONTAL_BOTTOM_LEFT,
+    E131_MATRIX_ORDER_HORIZONTAL_BOTTOM_RIGHT,
+    E131_MATRIX_ORDER_VERTICAL_TOP_LEFT,
+    E131_MATRIX_ORDER_VERTICAL_TOP_RIGHT,
+    E131_MATRIX_ORDER_VERTICAL_BOTTOM_LEFT,
+    E131_MATRIX_ORDER_VERTICAL_BOTTOM_RIGHT
+};
+
+typedef unsigned int e131_matrix_order;
+
+struct E131Device
+{
+    std::string name;
+    unsigned int num_leds;
+    unsigned int start_universe;
+    unsigned int start_channel;
+    unsigned int keepalive_time;
+    e131_rgb_order rgb_order;
+    zone_type type;
+    unsigned int matrix_width;
+    unsigned int matrix_height;
+    e131_matrix_order matrix_order;
+};
+
+class RGBController_E131 : public RGBController
+{
+public:
+    RGBController_E131(std::vector<E131Device> device_list);
+    ~RGBController_E131();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        SetCustomMode();
+    void        DeviceUpdateMode();
+
+    void        KeepaliveThreadFunction();
+
+private:
+	std::vector<E131Device> 	devices;
+    std::vector<e131_packet_t> 	packets;
+	std::vector<e131_addr_t> 	dest_addrs;
+	std::vector<unsigned int> 	universes;
+	int 						sockfd;
+    std::thread *               KeepaliveThread;
+    std::chrono::milliseconds                           keepalive_delay;
+    std::chrono::time_point<std::chrono::steady_clock>  last_update_time;
+};
@@ -0,0 +1,130 @@
+/*-------------------------------------------------------------------*\
+|  EKController.cpp                                                   |
+|                                                                     |
+|  Driver for EK Loop Connect                                         |
+|                                                                     |
+|  Chris M (Dr_No)          16th Jul 2020                             |
+|                                                                     |
+\*-------------------------------------------------------------------*/
+
+#include "EKController.h"
+
+static unsigned char colour_mode_data[][16] =
+{
+    { 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
+      0x00, 0x10, 0x20, 0x01, 0x01, 0x00, 0xFF, 0x64},          // Static
+    { 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
+      0x00, 0x10, 0x20, 0x01, 0x02, 0x00, 0xFF, 0x64},          // Breathing
+    { 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
+      0x00, 0x10, 0x20, 0x01, 0x03, 0xFF, 0xFF, 0x64},          // Fading
+    { 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
+      0x00, 0x10, 0x20, 0x01, 0x04, 0x00, 0xFF, 0x64},          // Marquee
+    { 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
+      0x00, 0x10, 0x20, 0x01, 0x05, 0x00, 0xFF, 0x64},          // Covering Marquee
+    { 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
+      0x00, 0x10, 0x20, 0x01, 0x06, 0x00, 0xFF, 0x64},          // Pulse
+    { 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
+      0x00, 0x10, 0x20, 0x01, 0x07, 0x00, 0xFF, 0x64},          // Wave
+    { 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
+      0x00, 0x10, 0x20, 0x01, 0x08, 0x00, 0xFF, 0x64},          // Alternating
+    { 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
+      0x00, 0x10, 0x20, 0x01, 0x09, 0x00, 0xFF, 0x64},          // Candle
+};
+
+static unsigned char speed_mode_data[][9] =
+{
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },   // Static
+    { 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 },   // Breathing
+    { 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 },   // Fading
+    { 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 },   // Marquee
+    { 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 },   // Covering Marquee
+    { 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 },   // Pulse
+    { 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 },   // Wave
+    { 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 },   // Alternating
+    { 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 }    // Candle
+};
+
+EKController::EKController(hid_device* dev_handle, wchar_t *_vendor, wchar_t *_device_name, char *_path)
+{
+    std::size_t tmp_size = wcslen(_vendor);
+
+    dev = dev_handle;
+
+    for(std::size_t i = 0; (i < tmp_size) && (i < EK_DEVICE_NAME_SIZE); i++)
+    {
+        device_name[i] = (char)_vendor[i];
+    }
+
+    for(std::size_t j = 0; (j < wcslen(_vendor)) && ((tmp_size + j) < EK_DEVICE_NAME_SIZE); j++)
+    {
+        device_name[tmp_size + j] = (char)_device_name[j];
+    }
+
+    location = _path;
+
+    current_mode  = EK_MODE_STATIC;
+    current_speed = EK_SPEED_NORMAL;
+}
+
+EKController::~EKController()
+{
+    if(dev)
+    {
+        hid_close(dev);
+    }
+}
+
+char* EKController::GetDeviceName()
+{
+    return device_name;
+}
+
+char* EKController::GetSerial()
+{
+    return serial;
+}
+
+std::string EKController::GetLocation()
+{
+    return location;
+}
+
+void EKController::SetMode(unsigned char mode, unsigned char speed)
+{
+    current_mode  = mode;
+    current_speed = speed;
+
+    SendUpdate();
+}
+
+void EKController::SetColor(unsigned char red, unsigned char green, unsigned char blue)
+{
+    current_red   = red;
+    current_green = green;
+    current_blue  = blue;
+
+    SendUpdate();
+}
+
+void EKController::SendUpdate()
+{
+    unsigned char buffer[EK_PACKET_LENGTH] = { 0x00 };
+    int buffer_size = (sizeof(buffer) / sizeof(buffer[0]));
+
+    for(std::size_t i = 0; i < EK_COLOUR_MODE_DATA_SIZE; i++)
+    {
+        buffer[i] = colour_mode_data[current_mode][i];
+    }
+
+    //Set the relevant colour info
+    buffer[EK_RED_BYTE]   = current_red;
+    buffer[EK_GREEN_BYTE] = current_green;
+    buffer[EK_BLUE_BYTE]  = current_blue;
+    buffer[EK_SPEED_BYTE] = speed_mode_data[current_mode][current_speed];
+
+    buffer[10] = 0x10;
+    buffer[47] = 0xFF;
+    buffer[48] = 0x00;
+
+    hid_write(dev, buffer, buffer_size);
+}
@@ -0,0 +1,84 @@
+/*-------------------------------------------------------------------*\
+|  EKController.h                                                     |
+|                                                                     |
+|  Driver for EK Loop Connect                                         |
+|                                                                     |
+|  Chris M (Dr_No)          16th Jul 2020                             |
+|                                                                     |
+\*-------------------------------------------------------------------*/
+
+#ifndef EKCONTROLLER_H
+#define EKCONTROLLER_H
+
+#include <string>
+#include <hidapi/hidapi.h>
+
+#define EK_COLOUR_MODE_DATA_SIZE (sizeof(colour_mode_data[0]) / sizeof(colour_mode_data[0][0]))
+#define EK_DEVICE_NAME_SIZE (sizeof(device_name) / sizeof(device_name[ 0 ]))
+#define EK_PACKET_LENGTH    0x3F
+
+enum
+{
+    EK_MODE_BYTE   = 12,
+    EK_SPEED_BYTE  = 14,
+    EK_RED_BYTE    = 16,
+    EK_GREEN_BYTE  = 17,
+    EK_BLUE_BYTE   = 18
+};
+
+enum
+{
+    EK_MODE_STATIC              = 0x00,                         //Static Mode
+    EK_MODE_BREATHING           = 0x01,                         //Breathing Mode
+    EK_MODE_FADING              = 0x02,                         //Fading Mode
+    EK_MODE_MARQUEE             = 0x03,                         //Marquee Mode
+    EK_MODE_COVERING_MARQUEE    = 0x04,                         //Covering Marquee Mode
+    EK_MODE_PULSE               = 0x05,                         //Pulse Mode
+    EK_MODE_SPECTRUM_WAVE       = 0x06,                         //Spectrum Wave Mode
+    EK_MODE_ALTERNATING         = 0x07,                         //Alternating Mode
+    EK_MODE_CANDLE              = 0x08                          //Candle Mode
+};
+
+enum
+{
+    EK_SPEED_SLOWEST              = 0x00, // Slowest speed
+    EK_SPEED_SLOWER               = 0x01, // Slower speed
+    EK_SPEED_SLOW                 = 0x02, // Slow speed
+    EK_SPEED_SLOWISH              = 0x03, // Slowish speed
+    EK_SPEED_NORMAL               = 0x04, // Normal speed
+    EK_SPEED_FASTISH              = 0x05, // Fastish speed
+    EK_SPEED_FAST                 = 0x06, // Fast speed
+    EK_SPEED_FASTER               = 0x07, // Faster speed
+    EK_SPEED_FASTEST              = 0x08, // Fastest speed
+};
+
+class EKController
+{
+public:
+    EKController(hid_device* dev_handle, wchar_t *_vendor, wchar_t *_device_name, char *_path);
+    ~EKController();
+
+    char* GetDeviceName();
+    char* GetSerial();
+    std::string GetLocation();
+
+    void SetMode(unsigned char mode, unsigned char speed);
+    void SetColor(unsigned char red, unsigned char green, unsigned char blue);
+
+private:
+    char                    device_name[32];
+    char                    serial[32];
+    std::string             location;
+    hid_device*             dev;
+
+    unsigned char           current_mode;
+    unsigned char           current_speed;
+
+    unsigned char           current_red;
+    unsigned char           current_green;
+    unsigned char           current_blue;
+
+    void SendUpdate();
+};
+
+#endif // EKCONTROLLER_H
@@ -0,0 +1,67 @@
+#include "Detector.h"
+#include "EKController.h"
+#include "RGBController.h"
+#include "RGBController_EKController.h"
+#include <hidapi/hidapi.h>
+
+#define EK_VID                0x0483
+
+#define EK_LOOP_CONNECT       0x5750
+
+#define EK_NUM_DEVICES (sizeof(ek_pids) / sizeof(ek_pids[ 0 ]))
+
+enum
+{
+    EK_PID = 0,
+    EK_INTERFACE = 1
+};
+
+static const unsigned int ek_pids[][2] =
+{  // PID,      Interface
+    { EK_LOOP_CONNECT,        0x00 }     //EK Loop Connect
+};
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectEKControllers                                                                    *
+*                                                                                          *
+*       Tests the USB address to see if any EK Controllers exists there.                   *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectEKControllers(std::vector<RGBController*>& rgb_controllers)
+{
+    hid_device_info* info = NULL;
+
+    //Look for the passed in cm_pids
+    hid_init();
+    info = hid_enumerate(EK_VID, 0x0);
+
+    while(info)
+    {
+        hid_device* dev = NULL;
+        if(info->vendor_id == EK_VID)
+        {
+            for(unsigned int ek_pid_idx = 0; ek_pid_idx < EK_NUM_DEVICES; ek_pid_idx++)
+            {
+                if((info->product_id        == ek_pids[ek_pid_idx][EK_PID])
+                 &&(info->interface_number  == ek_pids[ek_pid_idx][EK_INTERFACE]))
+                {
+                    dev = hid_open_path(info->path);
+                    break;
+                }
+            }
+        }
+
+        if(dev)
+        {
+            EKController* controller = new EKController(dev, info->manufacturer_string, info->product_string, info->path);
+            RGBController_EKController* rgb_controller = new RGBController_EKController(controller);
+            rgb_controllers.push_back(rgb_controller);
+        }
+        info = info->next;
+    }
+    hid_free_enumeration(info);
+}   /* DetectEKControllers() */
+
+REGISTER_DETECTOR("EK", DetectEKControllers);
@@ -0,0 +1,174 @@
+/*-------------------------------------------------------------------*\
+|  RGBController_EKController.cpp                                     |
+|                                                                     |
+|  Driver for EK Loop Connect                                         |
+|                                                                     |
+|  Chris M (Dr_No)          16th Jul 2020                             |
+|                                                                     |
+\*-------------------------------------------------------------------*/
+
+
+#include "RGBController_EKController.h"
+
+RGBController_EKController::RGBController_EKController(EKController* _dev)
+{
+    EK_dev  = _dev;
+
+    name        = EK_dev->GetDeviceName();
+    type        = DEVICE_TYPE_LEDSTRIP;
+    description = EK_dev->GetDeviceName();
+    version     = "1.0";
+    serial      = EK_dev->GetSerial();
+    location    = EK_dev->GetLocation();
+
+    mode Static;
+    Static.name                     = "Static";
+    Static.value                    = EK_MODE_STATIC;
+    Static.flags                    = MODE_FLAG_HAS_PER_LED_COLOR;
+    Static.color_mode               = MODE_COLORS_PER_LED;
+    modes.push_back(Static);
+
+    mode Breathing;
+    Breathing.name                  = "Breathing";
+    Breathing.value                 = EK_MODE_BREATHING;
+    Breathing.flags                 = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR;
+    Breathing.speed_min             = EK_SPEED_SLOWEST;
+    Breathing.speed_max             = EK_SPEED_FASTEST;
+    Breathing.color_mode            = MODE_COLORS_PER_LED;
+    Breathing.speed                 = EK_SPEED_NORMAL;
+    modes.push_back(Breathing);
+
+    mode Fading;
+    Fading.name                     = "Fading";
+    Fading.value                    = EK_MODE_FADING;
+    Fading.flags                    = MODE_FLAG_HAS_SPEED;
+    Fading.speed_min                = EK_SPEED_SLOWEST;
+    Fading.speed_max                = EK_SPEED_FASTEST;
+    Fading.color_mode               = MODE_COLORS_NONE;
+    Fading.speed                    = EK_SPEED_NORMAL;
+    modes.push_back(Fading);
+
+    mode Marquee;
+    Marquee.name                    = "Marquee";
+    Marquee.value                   = EK_MODE_MARQUEE;
+    Marquee.flags                   = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR;
+    Marquee.speed_min               = EK_SPEED_SLOWEST;
+    Marquee.speed_max               = EK_SPEED_FASTEST;
+    Marquee.color_mode              = MODE_COLORS_PER_LED;
+    Marquee.speed                   = EK_SPEED_NORMAL;
+    modes.push_back(Marquee);
+
+    mode Covering_Marquee;
+    Covering_Marquee.name           = "Covering Marquee";
+    Covering_Marquee.value          = EK_MODE_COVERING_MARQUEE;
+    Covering_Marquee.flags          = MODE_FLAG_HAS_SPEED;
+    Covering_Marquee.speed_min      = EK_SPEED_SLOWEST;
+    Covering_Marquee.speed_max      = EK_SPEED_FASTEST;
+    Covering_Marquee.color_mode     = MODE_COLORS_NONE;
+    Covering_Marquee.speed          = EK_SPEED_NORMAL;
+    modes.push_back(Covering_Marquee);
+
+    mode Pulse;
+    Pulse.name                      = "Pulse";
+    Pulse.value                     = EK_MODE_PULSE;
+    Pulse.flags                     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR;
+    Pulse.speed_min                 = EK_SPEED_SLOWEST;
+    Pulse.speed_max                 = EK_SPEED_FASTEST;
+    Pulse.color_mode                = MODE_COLORS_PER_LED;
+    Pulse.speed                     = EK_SPEED_NORMAL;
+    modes.push_back(Pulse);
+
+    mode Spectrum_Wave;
+    Spectrum_Wave.name              = "Spectrum_Wave";
+    Spectrum_Wave.value             = EK_MODE_SPECTRUM_WAVE;
+    Spectrum_Wave.flags             = MODE_FLAG_HAS_SPEED;
+    Spectrum_Wave.speed_min         = EK_SPEED_SLOWEST;
+    Spectrum_Wave.speed_max         = EK_SPEED_FASTEST;
+    Spectrum_Wave.color_mode        = MODE_COLORS_NONE;
+    Spectrum_Wave.speed             = EK_SPEED_NORMAL;
+    modes.push_back(Spectrum_Wave);
+
+    mode Alternating;
+    Alternating.name                = "Alternating";
+    Alternating.value               = EK_MODE_ALTERNATING;
+    Alternating.flags               = MODE_FLAG_HAS_SPEED;
+    Alternating.speed_min           = EK_SPEED_SLOWEST;
+    Alternating.speed_max           = EK_SPEED_FASTEST;
+    Alternating.color_mode          = MODE_COLORS_PER_LED;
+    Alternating.speed               = EK_SPEED_NORMAL;
+    modes.push_back(Alternating);
+
+    mode Candle;
+    Candle.name                    = "Candle";
+    Candle.value                   = EK_MODE_CANDLE;
+    Candle.flags                   = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR;
+    Candle.speed_min               = EK_SPEED_SLOWEST;
+    Candle.speed_max               = EK_SPEED_FASTEST;
+    Candle.color_mode              = MODE_COLORS_PER_LED;
+    Candle.speed                   = EK_SPEED_NORMAL;
+    modes.push_back(Candle);
+
+    SetupZones();
+}
+
+RGBController_EKController::~RGBController_EKController()
+{
+
+}
+
+void RGBController_EKController::SetupZones()
+{
+    zone EK_zone;
+    EK_zone.name          = "Loop Connect";
+    EK_zone.type          = ZONE_TYPE_SINGLE;
+    EK_zone.leds_min      = 1;
+    EK_zone.leds_max      = 1;
+    EK_zone.leds_count    = 1;
+    EK_zone.matrix_map    = NULL;
+    zones.push_back(EK_zone);
+
+    led EK_led;
+    EK_led.name = "EK LED";
+    leds.push_back(EK_led);
+
+    SetupColors();
+}
+
+void RGBController_EKController::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | ToDo                                                      |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_EKController::DeviceUpdateLEDs()
+{
+    unsigned char red = RGBGetRValue(colors[0]);
+    unsigned char grn = RGBGetGValue(colors[0]);
+    unsigned char blu = RGBGetBValue(colors[0]);
+    EK_dev->SetColor(red, grn, blu);
+}
+
+void RGBController_EKController::UpdateZoneLEDs(int zone)
+{
+    RGBColor      color = colors[zone];
+    unsigned char red   = RGBGetRValue(color);
+    unsigned char grn   = RGBGetGValue(color);
+    unsigned char blu   = RGBGetBValue(color);
+    EK_dev->SetColor(red, grn, blu);
+}
+
+void RGBController_EKController::UpdateSingleLED(int led)
+{
+    UpdateZoneLEDs(led);
+}
+
+void RGBController_EKController::SetCustomMode()
+{
+    active_mode = 0;
+}
+
+void RGBController_EKController::DeviceUpdateMode()
+{
+    EK_dev->SetMode(modes[active_mode].value, modes[active_mode].speed);
+}
@@ -0,0 +1,35 @@
+/*-------------------------------------------------------------------*\
+|  RGBController_EKController.h                                       |
+|                                                                     |
+|  Driver for EK Loop Connect                                         |
+|                                                                     |
+|  Chris M (Dr_No)          16th Jul 2020                             |
+|                                                                     |
+\*-------------------------------------------------------------------*/
+
+#ifndef RGBCONTROLLER_EKCONTROLLER_H
+#define RGBCONTROLLER_EKCONTROLLER_H
+
+#include "RGBController.h"
+#include "Controllers/EKController/EKController.h"
+
+class RGBController_EKController : public RGBController
+{
+public:
+    RGBController_EKController(EKController *_dev);
+    ~RGBController_EKController();
+
+    void        SetupZones();
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        SetCustomMode();
+    void        DeviceUpdateMode();
+private:
+    EKController* EK_dev;
+};
+
+#endif // RGBCONTROLLER_EKCONTROLLER_H
@@ -0,0 +1,97 @@
+#include "Detector.h"
+#include "EVGAGPUv1Controller.h"
+#include "EVGAGPUv2Controller.h"
+#include "RGBController.h"
+#include "RGBController_EVGAGPUv1.h"
+#include "RGBController_EVGAGPUv2.h"
+#include "i2c_smbus.h"
+#include "pci_ids.h"
+#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
+
+enum
+{
+    EVGA_RGB_V1,
+    EVGA_RGB_V2,
+};
+
+typedef struct
+{
+    int             pci_vendor;
+    int             pci_device;
+    int             pci_subsystem_vendor;
+    int             pci_subsystem_device;
+    int             gpu_rgb_version;
+    const char *    name;
+} gpu_pci_device;
+
+#define GPU_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ]))
+
+static const gpu_pci_device device_list[] =
+{
+    { NVIDIA_VEN,   NVIDIA_GTX1070_DEV,     EVGA_SUB_VEN,   EVGA_GTX1070_FTW_SUB_DEV,       EVGA_RGB_V1,    "EVGA GeForce GTX 1070 FTW"             },
+    { NVIDIA_VEN,   NVIDIA_RTX2070_OC_DEV,  EVGA_SUB_VEN,   EVGA_RTX2070_XC_OC_SUB_DEV,     EVGA_RGB_V2,    "EVGA GeForce RTX 2070 XC OC"           },
+    { NVIDIA_VEN,   NVIDIA_RTX2070S_DEV,    EVGA_SUB_VEN,   EVGA_RTX2070S_XC_ULTRA_SUB_DEV, EVGA_RGB_V2,    "EVGA GeForce RTX 2070 SUPER XC ULTRA"  },
+    { NVIDIA_VEN,   NVIDIA_RTX2080_DEV,     EVGA_SUB_VEN,   EVGA_RTX2080_XC_GAMING_SUB_DEV, EVGA_RGB_V2,    "EVGA GeForce RTX 2080 XC GAMING"       },
+};
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectEVGAGPUControllers                                                               *
+*                                                                                          *
+*       Detect EVGA GPU controllers on the enumerated I2C busses at address 0x49.          *
+*                                                                                          *
+*           bus - pointer to i2c_smbus_interface where EVGA GPU device is connected        *
+*           dev - I2C address of EVGA GPU device                                           *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectEVGAGPUControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers)
+{
+    for (unsigned int bus = 0; bus < busses.size(); bus++)
+    {
+        for(unsigned int dev_idx = 0; dev_idx < GPU_NUM_DEVICES; dev_idx++)
+        {
+            if (busses[bus]->port_id != 1)
+            {
+                break;
+            }
+
+            if(busses[bus]->pci_vendor           == device_list[dev_idx].pci_vendor           &&
+               busses[bus]->pci_device           == device_list[dev_idx].pci_device           &&
+               busses[bus]->pci_subsystem_vendor == device_list[dev_idx].pci_subsystem_vendor &&
+               busses[bus]->pci_subsystem_device == device_list[dev_idx].pci_subsystem_device)
+            {
+                switch(device_list[dev_idx].gpu_rgb_version)
+                {
+                    case EVGA_RGB_V1:
+                        {
+                            EVGAGPUv1Controller*     new_controller;
+                            RGBController_EVGAGPUv1* new_rgbcontroller;
+
+                            new_controller          = new EVGAGPUv1Controller(busses[bus], 0x49);
+                            new_rgbcontroller       = new RGBController_EVGAGPUv1(new_controller);
+                            new_rgbcontroller->name = device_list[dev_idx].name;
+                            rgb_controllers.push_back(new_rgbcontroller);
+                        }
+                        break;
+
+                    case EVGA_RGB_V2:
+                        {
+                            EVGAGPUv2Controller*     new_controller;
+                            RGBController_EVGAGPUv2* new_rgbcontroller;
+
+                            new_controller          = new EVGAGPUv2Controller(busses[bus], 0x49);
+                            new_rgbcontroller       = new RGBController_EVGAGPUv2(new_controller);
+                            new_rgbcontroller->name = device_list[dev_idx].name;
+                            rgb_controllers.push_back(new_rgbcontroller);
+                        }
+                        break;
+                }
+            }
+        }
+    }
+}   /* DetectEVGAGPUControllers() */
+
+REGISTER_I2C_DETECTOR("EVGA GPU", DetectEVGAGPUControllers);
@@ -0,0 +1,58 @@
+/*-----------------------------------------*\
+|  EVGAGPUv1Controller.cpp                  |
+|                                           |
+|  Driver for EVGA GPU RGB V1 (Pascal)      |
+|  lighting controller                      |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 9/11/2020   |
+\*-----------------------------------------*/
+
+#include "EVGAGPUv1Controller.h"
+
+EVGAGPUv1Controller::EVGAGPUv1Controller(i2c_smbus_interface* bus, evga_dev_id dev)
+{
+    this->bus = bus;
+    this->dev = dev;
+}
+
+EVGAGPUv1Controller::~EVGAGPUv1Controller()
+{
+
+}
+
+std::string EVGAGPUv1Controller::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);
+}
+
+unsigned char EVGAGPUv1Controller::GetRed()
+{
+    return(bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_V1_REG_RED));
+}
+
+unsigned char EVGAGPUv1Controller::GetGreen()
+{
+    return(bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_V1_REG_GREEN));
+}
+
+unsigned char EVGAGPUv1Controller::GetBlue()
+{
+    return(bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_V1_REG_BLUE));
+}
+
+void EVGAGPUv1Controller::SetColor(unsigned char red, unsigned char green, unsigned char blue)
+{
+    bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V1_REG_RED,   red);
+    bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V1_REG_GREEN, green);
+    bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V1_REG_BLUE,  blue);
+}
+
+void EVGAGPUv1Controller::SetMode(unsigned char mode)
+{
+    bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V1_REG_MODE, mode);
+}
@@ -0,0 +1,52 @@
+/*-----------------------------------------*\
+|  EVGAGPUv1Controller.h                    |
+|                                           |
+|  Definitions and types for EVGA GPU RGB   |
+|  V1 (Pascal) lighting controller          |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 9/11/2020   |
+\*-----------------------------------------*/
+
+#include <string>
+#include "i2c_smbus.h"
+
+#pragma once
+
+typedef unsigned char	evga_dev_id;
+
+enum
+{
+    EVGA_GPU_V1_REG_MODE                = 0x0C,
+    EVGA_GPU_V1_REG_RED                 = 0x09,
+    EVGA_GPU_V1_REG_GREEN               = 0x0A,
+    EVGA_GPU_V1_REG_BLUE                = 0x0B,
+};
+
+enum
+{
+    EVGA_GPU_V1_MODE_OFF                = 0x00,
+    EVGA_GPU_V1_MODE_CUSTOM             = 0x01,
+    EVGA_GPU_V1_MODE_RAINBOW            = 0x02,
+    EVGA_GPU_V1_MODE_BREATHING          = 0x05,
+};
+
+class EVGAGPUv1Controller
+{
+public:
+    EVGAGPUv1Controller(i2c_smbus_interface* bus, evga_dev_id dev);
+    ~EVGAGPUv1Controller();
+
+    std::string     GetDeviceLocation();
+
+    unsigned char   GetRed();
+    unsigned char   GetGreen();
+    unsigned char   GetBlue();
+
+    void            SetColor(unsigned char red, unsigned char green, unsigned char blue);
+    void            SetMode(unsigned char mode);
+
+private:
+    i2c_smbus_interface*    bus;
+    evga_dev_id             dev;
+
+};
@@ -0,0 +1,68 @@
+/*-----------------------------------------*\
+|  EVGAGPUv2Controller.cpp                  |
+|                                           |
+|  Driver for EVGA GPU RGB V2 (Turing)      |
+|  lighting controller                      |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 9/13/2020   |
+\*-----------------------------------------*/
+
+#include "EVGAGPUv2Controller.h"
+
+EVGAGPUv2Controller::EVGAGPUv2Controller(i2c_smbus_interface* bus, evga_dev_id dev)
+{
+    this->bus = bus;
+    this->dev = dev;
+}
+
+EVGAGPUv2Controller::~EVGAGPUv2Controller()
+{
+
+}
+
+std::string EVGAGPUv2Controller::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);
+}
+
+unsigned char EVGAGPUv2Controller::GetRed()
+{
+    return(bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_V2_REG_COLOR_A_RED));
+}
+
+unsigned char EVGAGPUv2Controller::GetGreen()
+{
+    return(bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_V2_REG_COLOR_A_GREEN));
+}
+
+unsigned char EVGAGPUv2Controller::GetBlue()
+{
+    return(bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_V2_REG_COLOR_A_BLUE));
+}
+
+void EVGAGPUv2Controller::SetColor(unsigned char red, unsigned char green, unsigned char blue)
+{
+    bus->i2c_smbus_write_byte_data(dev, 0x0E,                               0xE5);
+    bus->i2c_smbus_write_byte_data(dev, 0x0E,                               0xE9);
+    bus->i2c_smbus_write_byte_data(dev, 0x0E,                               0xF5);
+    bus->i2c_smbus_write_byte_data(dev, 0x0E,                               0xF9);
+    
+    bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_COLOR_A_RED,        red);
+    bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_COLOR_A_GREEN,      green);
+    bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_COLOR_A_BLUE,       blue);
+    bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_COLOR_A_BRIGHTNESS, 0x64);
+
+    bus->i2c_smbus_write_byte_data(dev, 0x08,                               0x01);
+    bus->i2c_smbus_write_byte_data(dev, 0x0E,                               0xF0);
+    bus->i2c_smbus_write_byte_data(dev, 0x0E,                               0xE0);
+}
+
+void EVGAGPUv2Controller::SetMode(unsigned char mode)
+{
+    bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_MODE, mode);
+}
@@ -0,0 +1,57 @@
+/*-----------------------------------------*\
+|  EVGAGPUv2Controller.h                    |
+|                                           |
+|  Definitions and types for EVGA GPU RGB   |
+|  V2 (Turing) lighting controller          |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 9/13/2020   |
+\*-----------------------------------------*/
+
+#include <string>
+#include "i2c_smbus.h"
+
+#pragma once
+
+typedef unsigned char	evga_dev_id;
+
+enum
+{
+    EVGA_GPU_V2_REG_MODE                = 0x60,
+    EVGA_GPU_V2_REG_COLOR_A_RED         = 0x6C,
+    EVGA_GPU_V2_REG_COLOR_A_GREEN       = 0x6D,
+    EVGA_GPU_V2_REG_COLOR_A_BLUE        = 0x6E,
+    EVGA_GPU_V2_REG_COLOR_A_BRIGHTNESS  = 0x6F,
+    EVGA_GPU_V2_REG_COLOR_B_RED         = 0x70,
+    EVGA_GPU_V2_REG_COLOR_B_GREEN       = 0x71,
+    EVGA_GPU_V2_REG_COLOR_B_BLUE        = 0x72,
+    EVGA_GPU_V2_REG_COLOR_B_BRIGHTNESS  = 0x73,
+};
+
+enum
+{
+    EVGA_GPU_V2_MODE_OFF                = 0x00,
+    EVGA_GPU_V2_MODE_CUSTOM             = 0x01,
+    EVGA_GPU_V2_MODE_RAINBOW            = 0x0F,
+    EVGA_GPU_V2_MODE_BREATHING          = 0x22,
+};
+
+class EVGAGPUv2Controller
+{
+public:
+    EVGAGPUv2Controller(i2c_smbus_interface* bus, evga_dev_id dev);
+    ~EVGAGPUv2Controller();
+
+    std::string     GetDeviceLocation();
+
+    unsigned char   GetRed();
+    unsigned char   GetGreen();
+    unsigned char   GetBlue();
+
+    void            SetColor(unsigned char red, unsigned char green, unsigned char blue);
+    void            SetMode(unsigned char mode);
+
+private:
+    i2c_smbus_interface*    bus;
+    evga_dev_id             dev;
+
+};
@@ -0,0 +1,118 @@
+/*-----------------------------------------*\
+|  RGBController_EVGAGPUv1.cpp              |
+|                                           |
+|  Generic RGB Interface for OpenRGB EVGA   |
+|  GPU V1 (Pascal) Driver                   |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 9/11/2020   |
+\*-----------------------------------------*/
+
+#include "RGBController_EVGAGPUv1.h"
+
+RGBController_EVGAGPUv1::RGBController_EVGAGPUv1(EVGAGPUv1Controller* evga_ptr)
+{
+    evga = evga_ptr;
+
+    name        = "EVGA GPU";
+    description = "EVGA RGB v1 GPU Device";
+    location    = evga->GetDeviceLocation();
+
+    type = DEVICE_TYPE_GPU;
+
+    mode Off;
+    Off.name       = "Off";
+    Off.value      = EVGA_GPU_V1_MODE_OFF;
+    Off.flags      = 0;
+    Off.color_mode = MODE_COLORS_NONE;
+    modes.push_back(Off);
+
+    mode Direct;
+    Direct.name       = "Direct";
+    Direct.value      = EVGA_GPU_V1_MODE_CUSTOM;
+    Direct.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
+    mode Rainbow;
+    Rainbow.name       = "Rainbow";
+    Rainbow.value      = EVGA_GPU_V1_MODE_RAINBOW;
+    Rainbow.flags      = 0;
+    Rainbow.color_mode = MODE_COLORS_NONE;
+    modes.push_back(Rainbow);
+
+    mode Breathing;
+    Breathing.name       = "Breathing";
+    Breathing.value      = EVGA_GPU_V1_MODE_BREATHING;
+    Breathing.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Breathing.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Breathing);
+
+    SetupZones();
+
+    // Initialize active mode
+    active_mode = 0;
+}
+
+void RGBController_EVGAGPUv1::SetupZones()
+{
+    /*---------------------------------------------------------*\
+    | This device only has one LED, so create a single zone and |
+    | LED for it                                                |
+    \*---------------------------------------------------------*/
+    zone* new_zone = new zone();
+    led*  new_led  = new led();
+
+    new_zone->name          = "GPU Zone";
+    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           = "GPU LED";
+
+    /*---------------------------------------------------------*\
+    | Push the zone and LED on to device vectors                |
+    \*---------------------------------------------------------*/
+    leds.push_back(*new_led);
+    zones.push_back(*new_zone);
+
+    SetupColors();
+}
+
+void RGBController_EVGAGPUv1::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_EVGAGPUv1::DeviceUpdateLEDs()
+{
+    RGBColor      color = colors[0];
+    unsigned char red   = RGBGetRValue(color);
+    unsigned char grn   = RGBGetGValue(color);
+    unsigned char blu   = RGBGetBValue(color);
+
+    evga->SetColor(red, grn, blu);
+}
+
+void RGBController_EVGAGPUv1::UpdateZoneLEDs(int /*zone*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_EVGAGPUv1::UpdateSingleLED(int /*led*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_EVGAGPUv1::SetCustomMode()
+{
+    active_mode = 1;
+}
+
+void RGBController_EVGAGPUv1::DeviceUpdateMode()
+{
+    evga->SetMode((unsigned char)modes[(unsigned int)active_mode].value);
+}
--- a/Show More
+++ b/Show More