More progress on getting CMake build on Linux

- fix many strings
- update missing translations

.github/workflows/issue_opened.yml

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

.github/workflows/pr_opened.yml

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

.gitlab/CODEOWNERS

@@ -43,6 +43,7 @@ CODEOWNERS @Calcprogrammer1
 /Controllers/EVGAGP102GPUController/
 /Controllers/EVGAPascalGPUController/
 /Controllers/EVGATuringGPUController/                       @TheRogueZeta
+/Controllers/EVGASMBusController/                           @balika011
 /Controllers/EVGAUSBController/                             @Dr_No
 /Controllers/EVisionKeyboardController/
 /Controllers/EspurnaController/

.gitlab/issue_templates/New Device.md

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

AutoStart/AutoStart-FreeBSD.cpp

@@ -1,17 +1,20 @@
-#include "AutoStart-FreeBSD.h"
-#include "LogManager.h"
-#include "filesystem.h"
+/*---------------------------------------------------------*\
+| AutoStart-FreeBSD.cpp                                     |
+|                                                           |
+|   Autostart implementation for FreeBSD                    |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include <fstream>
 #include <iostream>
 #include <limits.h>
 #include <unistd.h>
 #include <sstream>
-
-/*-----------------------------------------------------*\
-| FreeBSD AutoStart Implementation                      |
-| Public Methods                                        |
-\*-----------------------------------------------------*/
+#include "AutoStart-FreeBSD.h"
+#include "LogManager.h"
+#include "filesystem.h"
 
 AutoStart::AutoStart(std::string name)
 {
@@ -50,7 +53,7 @@ bool AutoStart::DisableAutoStart()
     }
     else
     {
-        LOG_ERROR("Could not establish correct autostart file path.");
+        LOG_ERROR("[AutoStart] Could not establish correct autostart file path.");
     }
 
     return(success);
@@ -72,7 +75,7 @@ bool AutoStart::EnableAutoStart(AutoStartInfo autostart_info)
         \*---------------------------------------------*/
         if(!autostart_file_stream)
         {
-            LOG_ERROR("Could not open %s for writing.", autostart_file.c_str());
+            LOG_ERROR("[AutoStart] Could not open %s for writing.", autostart_file.c_str());
             success = false;
         }
         /*---------------------------------------------*\
@@ -86,13 +89,13 @@ bool AutoStart::EnableAutoStart(AutoStartInfo autostart_info)
 
             if (!success)
             {
-                LOG_ERROR("An error occurred writing the auto start file.");
+                LOG_ERROR("[AutoStart] An error occurred writing the auto start file.");
             }
         }
     }
     else
     {
-        LOG_ERROR("Could not establish correct autostart file path.");
+        LOG_ERROR("[AutoStart] Could not establish correct autostart file path.");
     }
 
     return(success);

AutoStart/AutoStart-FreeBSD.h

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

AutoStart/AutoStart-Linux.cpp

@@ -1,17 +1,20 @@
-#include "AutoStart-Linux.h"
-#include "LogManager.h"
-#include "filesystem.h"
+/*---------------------------------------------------------*\
+| AutoStart-Linux.cpp                                       |
+|                                                           |
+|   Autostart implementation for Linux                      |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include <fstream>
 #include <iostream>
 #include <sstream>
 #include <unistd.h>
 #include <linux/limits.h>
-
-/*-----------------------------------------------------*\
-| Linux AutoStart Implementation                        |
-| Public Methods                                        |
-\*-----------------------------------------------------*/
+#include "AutoStart-Linux.h"
+#include "LogManager.h"
+#include "filesystem.h"
 
 AutoStart::AutoStart(std::string name)
 {
@@ -50,7 +53,7 @@ bool AutoStart::DisableAutoStart()
     }
     else
     {
-        LOG_ERROR("Could not establish correct autostart file path.");
+        LOG_ERROR("[AutoStart] Could not establish correct autostart file path.");
     }
 
     return(success);
@@ -73,7 +76,7 @@ bool AutoStart::EnableAutoStart(AutoStartInfo autostart_info)
         \*---------------------------------------------*/
         if(!autostart_file_stream)
         {
-            LOG_ERROR("Could not open %s for writing.", autostart_file.c_str());
+            LOG_ERROR("[AutoStart] Could not open %s for writing.", autostart_file.c_str());
             success = false;
         }
         /*---------------------------------------------*\
@@ -87,13 +90,13 @@ bool AutoStart::EnableAutoStart(AutoStartInfo autostart_info)
 
             if (!success)
             {
-                LOG_ERROR("An error occurred writing the auto start file.");
+                LOG_ERROR("[AutoStart] An error occurred writing the auto start file.");
             }
         }
     }
     else
     {
-        LOG_ERROR("Could not establish correct autostart file path.");
+        LOG_ERROR("[AutoStart] Could not establish correct autostart file path.");
     }
 
     return(success);
@@ -122,7 +125,7 @@ std::string AutoStart::GetExePath()
     char exepath[ PATH_MAX ];
 
     ssize_t count = readlink("/proc/self/exe", exepath, PATH_MAX);
-    
+
     return(std::string(exepath, (count > 0) ? count : 0));
 }
 
@@ -159,7 +162,7 @@ std::string AutoStart::GenerateDesktopFile(AutoStartInfo autostart_info)
     }
 
     fileContents << std::endl;
-    
+
     return(fileContents.str());
 }
 
@@ -198,7 +201,7 @@ void AutoStart::InitAutoStart(std::string name)
         std::error_code ec;
 
         bool success = true;
-        
+
         if(!filesystem::exists(autostart_dir))
         {
             success = filesystem::create_directories(autostart_dir, ec);

AutoStart/AutoStart-Linux.h

@@ -1,3 +1,12 @@
+/*---------------------------------------------------------*\
+| AutoStart-Linux.h                                         |
+|                                                           |
+|   Autostart implementation for Linux                      |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #pragma once
 
 #include <string>

AutoStart/AutoStart-MacOS.cpp

@@ -1,18 +1,20 @@
-#include "AutoStart-MacOS.h"
-#include "LogManager.h"
-#include "filesystem.h"
+/*---------------------------------------------------------*\
+| AutoStart-MacOS.cpp                                       |
+|                                                           |
+|   Autostart implementation for MacOS                      |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include <fstream>
 #include <sstream>
 #include <iostream>
 #include <unistd.h>
-
 #include <mach-o/dyld.h>
-
-/*-----------------------------------------------------*\
-| MacOS AutoStart Implementation                        |
-| Public Methods                                        |
-\*-----------------------------------------------------*/
+#include "AutoStart-MacOS.h"
+#include "LogManager.h"
+#include "filesystem.h"
 
 AutoStart::AutoStart(std::string name)
 {
@@ -51,7 +53,7 @@ bool AutoStart::DisableAutoStart()
     }
     else
     {
-        LOG_ERROR("Could not establish correct autostart file path.");
+        LOG_ERROR("[AutoStart] Could not establish correct autostart file path.");
     }
 
     return(success);
@@ -74,7 +76,7 @@ bool AutoStart::EnableAutoStart(AutoStartInfo autostart_info)
         \*---------------------------------------------*/
         if(!autostart_file_stream)
         {
-            LOG_ERROR("Could not open %s for writing.", autostart_file.c_str());
+            LOG_ERROR("[AutoStart] Could not open %s for writing.", autostart_file.c_str());
             success = false;
         }
         /*---------------------------------------------*\
@@ -88,13 +90,13 @@ bool AutoStart::EnableAutoStart(AutoStartInfo autostart_info)
 
             if (!success)
             {
-                LOG_ERROR("An error occurred writing the auto start file.");
+                LOG_ERROR("[AutoStart] An error occurred writing the auto start file.");
             }
         }
     }
     else
     {
-        LOG_ERROR("Could not establish correct autostart file path.");
+        LOG_ERROR("[AutoStart] Could not establish correct autostart file path.");
     }
 
     return(success);
@@ -152,7 +154,7 @@ std::string AutoStart::GenerateLaunchAgentFile(AutoStartInfo autostart_info)
     fileContents << "    <key>ProgramArguments</key>"                                                                               << std::endl;
     fileContents << "    <array>"                                                                                                   << std::endl;
     fileContents << "        <string>" << autostart_info.path << "</string>"                                                        << std::endl;
-    
+
     if(autostart_info.args != "")
     {
         std::istringstream arg_parser(autostart_info.args);
@@ -163,12 +165,12 @@ std::string AutoStart::GenerateLaunchAgentFile(AutoStartInfo autostart_info)
             fileContents << "        <string>" << arg << "</string>"                                                                << std::endl;
         }
     }
-    
+
     fileContents << "    </array>"                                                                                                  << std::endl;
     fileContents << "    <key>RunAtLoad</key><true/>"                                                                               << std::endl;
     fileContents << "</dict>"                                                                                                       << std::endl;
     fileContents << "</plist>"                                                                                                      << std::endl;
-    
+
     return(fileContents.str());
 }
 
@@ -193,7 +195,7 @@ void AutoStart::InitAutoStart(std::string name)
         std::error_code ec;
 
         bool success = true;
-        
+
         if(!filesystem::exists(autostart_dir))
         {
             success = filesystem::create_directories(autostart_dir, ec);

AutoStart/AutoStart-MacOS.h

@@ -1,3 +1,12 @@
+/*---------------------------------------------------------*\
+| AutoStart-MacOS.h                                         |
+|                                                           |
+|   Autostart implementation for MacOS                      |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #pragma once
 
 #include <string>

AutoStart/AutoStart-Windows.cpp

@@ -1,17 +1,19 @@
-#include "AutoStart-Windows.h"
-#include "LogManager.h"
-#include "filesystem.h"
+/*---------------------------------------------------------*\
+| AutoStart-Windows.cpp                                     |
+|                                                           |
+|   Autostart implementation for Windows                    |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include <fstream>
 #include <iostream>
-
-#include "windows.h"
 #include <shlobj.h>
-
-/*-----------------------------------------------------*\
-| Windows AutoStart Implementation                      |
-| Public Methods                                        |
-\*-----------------------------------------------------*/
+#include "AutoStart-Windows.h"
+#include "LogManager.h"
+#include "filesystem.h"
+#include "windows.h"
 
 AutoStart::AutoStart(std::string name)
 {
@@ -41,16 +43,16 @@ bool AutoStart::DisableAutoStart()
         else
         {
             success = filesystem::remove(autostart_file, autostart_file_remove_errcode);
-            
+
             if(!success)
             {
-                LOG_ERROR("An error occurred removing the auto start file.");
+                LOG_ERROR("[AutoStart] An error occurred removing the auto start file.");
             }
         }
     }
     else
     {
-        LOG_ERROR("Could not establish correct autostart file path.");
+        LOG_ERROR("[AutoStart] Could not establish correct autostart file path.");
     }
 
     return(success);
@@ -97,11 +99,11 @@ bool AutoStart::EnableAutoStart(AutoStartInfo autostart_info)
             shellLink->SetArguments(argumentsw.c_str());
             shellLink->SetDescription(descriptionw.c_str());
             shellLink->SetIconLocation(iconw.c_str(), 0);
-            
+
             IPersistFile* persistFile;
-            
+
             result                                  = shellLink->QueryInterface(IID_IPersistFile, (void**)&persistFile);
-            
+
             if(SUCCEEDED(result))
             {
                 result                              = persistFile->Save(startupfilepathw.c_str(), TRUE);
@@ -122,7 +124,7 @@ bool AutoStart::EnableAutoStart(AutoStartInfo autostart_info)
     }
     else
     {
-        LOG_ERROR("Could not establish correct autostart file path.");
+        LOG_ERROR("[AutoStart] Could not establish correct autostart file path.");
     }
 
     return success;
@@ -151,7 +153,7 @@ std::string AutoStart::GetExePath()
     char exepath[MAX_PATH] = "";
 
     DWORD count = GetModuleFileNameA(NULL, exepath, MAX_PATH);
-    
+
     return(std::string(exepath, (count > 0) ? count : 0));
 }
 
@@ -197,8 +199,8 @@ std::wstring AutoStart::utf8_decode(const std::string& str)
     int size_needed = MultiByteToWideChar(CP_UTF8, 0, &str[0], (int) str.size(), nullptr, 0);
 
     std::wstring wstrTo(size_needed, 0);
-    
+
     MultiByteToWideChar(CP_UTF8, 0, &str[0], (int) str.size(), &wstrTo[0], size_needed);
-    
+
     return(wstrTo);
 }

AutoStart/AutoStart-Windows.h

@@ -1,3 +1,12 @@
+/*---------------------------------------------------------*\
+| AutoStart-Windows.h                                       |
+|                                                           |
+|   Autostart implementation for Windows                    |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #pragma once
 
 #include <string>

AutoStart/AutoStart.cpp

@@ -1,9 +1,13 @@
-#include "AutoStart.h"
+/*---------------------------------------------------------*\
+| AutoStart.cpp                                             |
+|                                                           |
+|   Autostart common implementation                         |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
-/*-----------------------------------------------------*\
-| Common AutoStart Implementation                       |
-| Public Methods                                        |
-\*-----------------------------------------------------*/
+#include "AutoStart.h"
 
 std::string AutoStartInterface::GetAutoStartFile()
 {

AutoStart/AutoStart.h

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

CMakeLists.txt

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

Colors.h

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

Controllers/A4TechController/A4Tech_Detector.cpp

@@ -1,19 +1,20 @@
-/*-------------------------------------------------------------------*\
-|  A4TechDetector.cpp                                                 |
-|                                                                     |
-|  Driver for A4Tech Devices Detector                                 |
-|                                                                     |
-|  Chris M (Dr_No)                              30 Jun 2022           |
-|  Mohammed Julfikar Ali Mahbub (o-julfikar)    01 Apr 2024           |
-|                                                                     |
-\*-------------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| A4TechDetector.cpp                                        |
+|                                                           |
+|   Detector for A4Tech Devices                             |
+|                                                           |
+|   Chris M (Dr_No)                             30 Jun 2022 |
+|   Mohammed Julfikar Ali Mahbub (o-julfikar)   01 Apr 2024 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 /*-----------------------------------------------------*\
 | OpenRGB includes                                      |
 \*-----------------------------------------------------*/
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
-#include "RGBController.h"
 
 /*-----------------------------------------------------*\
 | A4 Tech specific includes                             |
@@ -54,7 +55,9 @@ void DetectBloodyB820R(hid_device_info* info, const std::string& name)
     }
 }
 
-REGISTER_HID_DETECTOR_IPU("Bloody W60 Pro",         DetectA4TechMouseControllers,       A4_TECH_VID,    BLOODY_W60_PRO_PID,     2,      0xFF33,     0x0529);
-REGISTER_HID_DETECTOR_IPU("Bloody W90 Max",         DetectA4TechMouseControllers,       A4_TECH_VID,    BLOODY_W90_MAX_PID,     2,      0xFF33,     0x053D);
-REGISTER_HID_DETECTOR_IPU("Bloody MP 50RS",         DetectA4TechMouseControllers,       A4_TECH_VID,    BLOODY_MP_50RS_PID,     2,      0xFFF2,     0x6009);
-REGISTER_HID_DETECTOR_IPU("A4Tech Bloody B820R",    DetectBloodyB820R,                  A4_TECH_VID,    BLOODY_B820R_PID,       2,      0xFF52,     0x0210);
+REGISTER_HID_DETECTOR_IPU("Bloody W60 Pro",  DetectA4TechMouseControllers,       A4_TECH_VID,    BLOODY_W60_PRO_PID,     2,      0xFF33,     0x0529);
+REGISTER_HID_DETECTOR_IPU("Bloody W70 Max",  DetectA4TechMouseControllers,       A4_TECH_VID,    BLOODY_W70_MAX_PID,     2,      0xFF33,     0x0518);
+REGISTER_HID_DETECTOR_IPU("Bloody W90 Max",  DetectA4TechMouseControllers,       A4_TECH_VID,    BLOODY_W90_MAX_PID,     2,      0xFF33,     0x053D);
+REGISTER_HID_DETECTOR_IPU("Bloody W90 Pro",  DetectA4TechMouseControllers,       A4_TECH_VID,    BLOODY_W90_PRO_PID,     2,      0xFF33,     0x054D);
+REGISTER_HID_DETECTOR_IPU("Bloody MP 50RS",  DetectA4TechMouseControllers,       A4_TECH_VID,    BLOODY_MP_50RS_PID,     2,      0xFFF2,     0x6009);
+REGISTER_HID_DETECTOR_IPU("Bloody B820R",    DetectBloodyB820R,                  A4_TECH_VID,    BLOODY_B820R_PID,       2,      0xFF52,     0x0210);

Controllers/A4TechController/BloodyB820RController/BloodyB820RController.cpp

@@ -1,21 +1,24 @@
-/*-------------------------------------------------------------------*\
-|  BloodyB820RController.cpp                                          |
-|                                                                     |
-|  Driver for A4Tech Bloody B820R Keyboard Controller                 |
-|                                                                     |
-|  Mohammed Julfikar Ali Mahbub (o-julfikar)          01 Apr 2024     |
-|                                                                     |
-\*-------------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| BloodyB820RController.cpp                                 |
+|                                                           |
+|   Driver for A4Tech Bloody B820R Keyboard                 |
+|                                                           |
+|   Mohammed Julfikar Ali Mahbub (o-julfikar)   01 Apr 2024 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "BloodyB820RController.h"
+#include "StringUtils.h"
 
-/*--------------------------------------------------------------------------------------*\
- * The controller for this device should pass a packet of 64 bytes where the subsequent *
- * two packets are for RED, GREEN, and BLUE respectively. The first 6 bytes are control *
- * or information bytes and colors bytes starts from index 6. Moreover, the first pack- *
- * et of each RGB contains color for 58 keys and the rest (104 - 58 == 46) are send on  *
- * the second packet.                                                                   *
-\*--------------------------------------------------------------------------------------*/
+/*-------------------------------------------------------------------------------------*\
+| The controller for this device should pass a packet of 64 bytes where the subsequent  |
+| two packets are for RED, GREEN, and BLUE respectively. The first 6 bytes are control  |
+| or information bytes and colors bytes starts from index 6. Moreover, the first pack-  |
+| et of each RGB contains color for 58 keys and the rest (104 - 58 == 46) are send on   |
+| the second packet.                                                                    |
+\*-------------------------------------------------------------------------------------*/
 
 BloodyB820RController::BloodyB820RController(hid_device* dev_handle, const char* path)
 {
@@ -33,14 +36,15 @@ BloodyB820RController::~BloodyB820RController()
 
 std::string BloodyB820RController::GetSerial()
 {
-    const int szTemp    = HID_MAX_STR;
-    wchar_t   tmpName[szTemp];
+    wchar_t serial_string[HID_MAX_STR];
+    int ret = hid_get_serial_number_string(dev, serial_string, HID_MAX_STR);
 
-    hid_get_serial_number_string(dev, tmpName, szTemp);
-    std::wstring wName  = std::wstring(tmpName);
-    std::string serial  = std::string(wName.begin(), wName.end());
+    if(ret != 0)
+    {
+        return("");
+    }
 
-    return serial;
+    return(StringUtils::wstring_to_string(serial_string));
 }
 
 std::string BloodyB820RController::GetLocation()
@@ -50,12 +54,12 @@ std::string BloodyB820RController::GetLocation()
 
 void  BloodyB820RController::SendControlPacket(uint8_t data)
 {
-    uint8_t buffer[BLOODY_B820R_PACKET_SIZE]   = { 0x07, 0x03, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00 };
+    uint8_t buffer[BLOODY_B820R_PACKET_SIZE]    = { 0x07, 0x03, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00 };
 
     hid_send_feature_report(dev, buffer, BLOODY_B820R_PACKET_SIZE);
 
-    buffer[BLOODY_B820R_MODE_BYTE]                   = 0;
-    buffer[BLOODY_B820R_DATA_BYTE]                   = data;
+    buffer[BLOODY_B820R_MODE_BYTE]              = 0;
+    buffer[BLOODY_B820R_DATA_BYTE]              = data;
 
     hid_send_feature_report(dev, buffer, BLOODY_B820R_PACKET_SIZE);
 }
@@ -75,14 +79,12 @@ void BloodyB820RController::SetLEDDirect(std::vector<RGBColor> colors)
     |   packet_map is the index of the Key from full_matrix_map and     |
     |   the value is the position in the direct packet buffer           |
     \*-----------------------------------------------------------------*/
-
-
     for(size_t i = 0; i < colors.size(); i++)
     {
-        RGBColor    color                     = colors[i];
-        uint8_t     offset                    = BLOODY_B820R_RGB_OFFSET;
-        uint8_t     buffer_idx                = offset + i % BLOODY_B820R_RGB_BUFFER_SIZE;
-        uint8_t*    buffers[2][3]             =
+        RGBColor    color                       = colors[i];
+        uint8_t     offset                      = BLOODY_B820R_RGB_OFFSET;
+        uint8_t     buffer_idx                  = offset + i % BLOODY_B820R_RGB_BUFFER_SIZE;
+        uint8_t*    buffers[2][3]               =
                 {
                         {r1_buffer, g1_buffer, b1_buffer},
                         {r2_buffer, g2_buffer, b2_buffer}
@@ -99,4 +101,4 @@ void BloodyB820RController::SetLEDDirect(std::vector<RGBColor> colors)
     hid_send_feature_report(dev, g2_buffer, BLOODY_B820R_PACKET_SIZE);
     hid_send_feature_report(dev, b1_buffer, BLOODY_B820R_PACKET_SIZE);
     hid_send_feature_report(dev, b2_buffer, BLOODY_B820R_PACKET_SIZE);
-}
+}

Controllers/A4TechController/BloodyB820RController/BloodyB820RController.h

@@ -1,19 +1,21 @@
-/*-------------------------------------------------------------------*\
-|  BloodyB820RController.h                                            |
-|                                                                     |
-|  Driver for A4Tech Bloody B820R Keyboard Controller                 |
-|                                                                     |
-|  Mohammed Julfikar Ali Mahbub (o-julfikar)          01 Apr 2024     |
-|                                                                     |
-\*-------------------------------------------------------------------*/
-
-#include <string>
-#include <hidapi/hidapi.h>
-#include "RGBController.h"
+/*---------------------------------------------------------*\
+| BloodyB820RController.h                                   |
+|                                                           |
+|   Driver for A4Tech Bloody B820R Keyboard                 |
+|                                                           |
+|   Mohammed Julfikar Ali Mahbub (o-julfikar)   01 Apr 2024 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #pragma once
-#define NA                                      0xFFFFFFFF
-#define HID_MAX_STR                             255
+
+#include <string>
+#include <hidapi.h>
+#include "RGBController.h"
+
+#define HID_MAX_STR                     255
 
 #define BLOODY_B820R_RGB_BUFFER_SIZE    58
 #define BLOODY_B820R_RGB_OFFSET         6
@@ -25,9 +27,9 @@
 #define BLOODY_B820R_RELEASE_CONTROL    0x00
 
 /*---------------------------------------------------------*\
-| Bloody B820R product ID                                    |
+| Bloody B820R product ID                                   |
 \*---------------------------------------------------------*/
-#define BLOODY_B820R_PID                               0xFA10
+#define BLOODY_B820R_PID                            0xFA10
 
 enum
 {

Controllers/A4TechController/BloodyB820RController/RGBController_BloodyB820R.cpp

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

Controllers/A4TechController/BloodyB820RController/RGBController_BloodyB820R.h

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------*\
+| RGBController_BloodyB820R.h                               |
+|                                                           |
+|   RGBController for A4Tech Bloody B820R Keyboard          |
+|                                                           |
+|   Mohammed Julfikar Ali Mahbub (o-julfikar)   01 Apr 2024 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include <vector>
+#include "RGBController.h"
+#include "BloodyB820RController.h"
+
+class RGBController_BloodyB820R : public RGBController
+{
+public:
+    RGBController_BloodyB820R(BloodyB820RController* controller_ptr);
+    ~RGBController_BloodyB820R();
+
+    void    SetupZones();
+    void    ResizeZone(int zone, int new_size);
+
+    void    DeviceUpdateLEDs();
+    void    UpdateZoneLEDs(int zone);
+    void    UpdateSingleLED(int led);
+
+    void    DeviceUpdateMode();
+
+private:
+    BloodyB820RController* controller;
+};

Controllers/A4TechController/BloodyMouseController/BloodyMouseController.cpp

@@ -1,14 +1,16 @@
-/*---------------------------------------------------------------------*\
-|  BloodyMouseController.cpp                                            |
-|                                                                       |
-|  Driver for BloodyMouse USB Controller                                |
-|                                                                       |
-|  Chris M (Dr_No)          30 Jun 2022                                 |
-|                                                                       |
-\*---------------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| BloodyMouseController.cpp                                 |
+|                                                           |
+|   Driver for A4Tech Bloody Mouse                          |
+|                                                           |
+|   Chris M (Dr_No)                             30 Jun 2022 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "BloodyMouseController.h"
-#include "LogManager.h"
+#include "StringUtils.h"
 
 BloodyMouseController::BloodyMouseController(hid_device* dev_handle, const char* path, uint16_t product_id)
 {
@@ -26,26 +28,20 @@ BloodyMouseController::~BloodyMouseController()
 
 uint16_t BloodyMouseController::GetPid()
 {
-    return pid;
+    return(pid);
 }
 
 std::string BloodyMouseController::GetSerial()
 {
-    const uint8_t   sz  = HID_MAX_STR;
-    wchar_t         tmp[sz];
+    wchar_t serial_string[HID_MAX_STR];
+    int ret = hid_get_serial_number_string(dev, serial_string, HID_MAX_STR);
 
-    int ret             = hid_get_serial_number_string(dev, tmp, sz);
-
-    if (ret != 0)
+    if(ret != 0)
     {
-        LOG_DEBUG("[BloodyMouse] Get HID Serial string failed");
         return("");
     }
 
-    std::wstring w_tmp  = std::wstring(tmp);
-    std::string serial  = std::string(w_tmp.begin(), w_tmp.end());
-
-    return serial;
+    return(StringUtils::wstring_to_string(serial_string));
 }
 
 std::string BloodyMouseController::GetLocation()
@@ -53,7 +49,7 @@ std::string BloodyMouseController::GetLocation()
     return("HID: " + location);
 }
 
-void  BloodyMouseController::InitDevice()
+void BloodyMouseController::InitDevice()
 {
     uint8_t buffer[BLOODYMOUSE_WRITE_PACKET_SIZE]   = { 0x07, 0x03, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00 };
 
@@ -65,7 +61,7 @@ void  BloodyMouseController::InitDevice()
     hid_send_feature_report(dev, buffer, BLOODYMOUSE_WRITE_PACKET_SIZE);
 }
 
-void  BloodyMouseController::SetLedsDirect(std::vector<RGBColor> colors)
+void BloodyMouseController::SetLedsDirect(std::vector<RGBColor> colors)
 {
     uint8_t buffer[BLOODYMOUSE_WRITE_PACKET_SIZE]   = { 0x07, 0x03, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00 };
 

Controllers/A4TechController/BloodyMouseController/BloodyMouseController.h

@@ -1,30 +1,34 @@
-/*---------------------------------------------------------------------*\
-|  BloodyMouseController.h                                              |
-|                                                                       |
-|  Driver for BloodyMouse USB Controller                                |
-|                                                                       |
-|  Chris M (Dr_No)          30 Jun 2022                                 |
-|                                                                       |
-\*---------------------------------------------------------------------*/
-
-#include <string>
-#include <hidapi/hidapi.h>
-#include "RGBController.h"
+/*---------------------------------------------------------*\
+| BloodyMouseController.h                                   |
+|                                                           |
+|   Driver for A4Tech Bloody Mouse                          |
+|                                                           |
+|   Chris M (Dr_No)                             30 Jun 2022 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #pragma once
 
+#include <string>
+#include <hidapi.h>
+#include "RGBController.h"
+
 /*-----------------------------------------------------*\
 | Mouse product IDs                                     |
 \*-----------------------------------------------------*/
 #define BLOODY_W60_PRO_PID                          0x37EA
+#define BLOODY_W70_MAX_PID                          0x79EF
 #define BLOODY_W90_MAX_PID                          0x3666
+#define BLOODY_W90_PRO_PID                          0x39B6
 
 /*-----------------------------------------------------*\
 | Mousemat product IDs                                  |
 \*-----------------------------------------------------*/
 #define BLOODY_MP_50RS_PID                          0xFA60
 
-#define HID_MAX_STR 255
+#define HID_MAX_STR                     255
 #define BLOODYMOUSE_WRITE_PACKET_SIZE   64
 
 #define BLOODYMOUSE_BRIGHTNESS_MIN      0
@@ -54,6 +58,7 @@ public:
     std::string     GetLocation();
 
     void            SetLedsDirect(std::vector<RGBColor> colors);
+
 private:
     uint16_t        pid;
     std::string     location;

Controllers/A4TechController/BloodyMouseController/RGBController_BloodyMouse.cpp

@@ -1,11 +1,13 @@
-/*---------------------------------------------------------------------*\
-|  RGBController_BloodyMouse.cpp                                        |
-|                                                                       |
-|  Driver for BloodyMouse USB Controller                                |
-|                                                                       |
-|  Chris M (Dr_No)          30 Jun 2022                                 |
-|                                                                       |
-\*---------------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_BloodyMouse.cpp                             |
+|                                                           |
+|   RGBController for A4Tech Bloody Mouse                   |
+|                                                           |
+|   Chris M (Dr_No)                             30 Jun 2022 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "RGBController_BloodyMouse.h"
 
@@ -107,7 +109,9 @@ void RGBController_BloodyMouse::SetupZones()
         case BLOODY_W60_PRO_PID:
             layout = w60_pro;
             break;
+        case BLOODY_W70_MAX_PID:
         case BLOODY_W90_MAX_PID:
+        case BLOODY_W90_PRO_PID:
             layout = w90_max;
             break;
         case BLOODY_MP_50RS_PID:
@@ -125,7 +129,7 @@ void RGBController_BloodyMouse::SetupZones()
 
         zone new_zone;
         new_zone.name           = mz.name;
-        new_zone.leds_min       = mz.zone_leds.size();
+        new_zone.leds_min       = (unsigned int)mz.zone_leds.size();
         new_zone.leds_max       = new_zone.leds_min;
         new_zone.leds_count     = new_zone.leds_min;
         new_zone.type           = bool_single ? ZONE_TYPE_SINGLE : ZONE_TYPE_LINEAR;

Controllers/A4TechController/BloodyMouseController/RGBController_BloodyMouse.h

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

Controllers/A4TechController/RGBController_BloodyB820R.cpp

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

Controllers/A4TechController/RGBController_BloodyB820R.h

@@ -1,32 +0,0 @@
-/*-------------------------------------------------------------------*\
-|  RGBController_BloodyB820R.h                                |
-|                                                                     |
-|  Driver for A4Tech Bloody B820R Keyboard Controller                   |
-|                                                                     |
-|  Mohammed Julfikar Ali Mahbub (o-julfikar)          01 Apr 2024     |
-|                                                                     |
-\*-------------------------------------------------------------------*/
-
-#pragma once
-#include "RGBController.h"
-#include "BloodyB820RController.h"
-#include <vector>
-
-class RGBController_BloodyB820R : public RGBController
-{
-public:
-    RGBController_BloodyB820R(BloodyB820RController* controller_ptr);
-    ~RGBController_BloodyB820R();
-
-    void    SetupZones();
-    void    ResizeZone(int zone, int new_size);
-
-    void    DeviceUpdateLEDs();
-    void    UpdateZoneLEDs(int zone);
-    void    UpdateSingleLED(int led);
-
-    void    DeviceUpdateMode();
-
-private:
-    BloodyB820RController* controller;
-};

Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp

@@ -1,21 +1,24 @@
-/*-----------------------------------------*\
-|  AMDWraithPrismController.h               |
-|                                           |
-|  Driver for AMD Wraith Prism RGB lighting |
-|  controller                               |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/6/2019   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| AMDWraithPrismController.cpp                              |
+|                                                           |
+|   Driver for AMD Wraith Prism                             |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                06 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
-#include "AMDWraithPrismController.h"
 #include <cstring>
 #include <stdio.h>
 #include <stdlib.h>
+#include "AMDWraithPrismController.h"
+#include "StringUtils.h"
 
 AMDWraithPrismController::AMDWraithPrismController(hid_device* dev_handle, const char* path)
 {
-    dev         = dev_handle;
-    location    = path;
+    dev                         = dev_handle;
+    location                    = path;
 
     current_fan_mode            = AMD_WRAITH_PRISM_FAN_LOGO_MODE_STATIC;
     current_fan_speed           = 0xFF;
@@ -53,10 +56,7 @@ std::string AMDWraithPrismController::GetSerialString()
         return("");
     }
 
-    std::wstring return_wstring = serial_string;
-    std::string return_string(return_wstring.begin(), return_wstring.end());
-
-    return(return_string);
+    return(StringUtils::wstring_to_string(serial_string));
 }
 
 std::string AMDWraithPrismController::GetFirmwareVersionString()

Controllers/AMDWraithPrismController/AMDWraithPrismController.h

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

Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp

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

Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp

@@ -1,11 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_AMDWraithPrism.cpp         |
-|                                           |
-|  Generic RGB Interface for AMD Wraith     |
-|  Prism                                    |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/25/2019  |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AMDWraithPrism.cpp                          |
+|                                                           |
+|   RGBController for AMD Wraith Prism                      |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                25 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "RGBController_AMDWraithPrism.h"
 
@@ -25,14 +27,14 @@
 
 RGBController_AMDWraithPrism::RGBController_AMDWraithPrism(AMDWraithPrismController* controller_ptr)
 {
-    controller  = controller_ptr;
+    controller                  = controller_ptr;
 
-    name        = "AMD Wraith Prism";
-    vendor      = "Cooler Master";
-    type        = DEVICE_TYPE_COOLER;
-    description = "AMD Wraith Prism Device";
-    version     = controller->GetFirmwareVersionString();
-    location    = controller->GetLocationString();
+    name                        = "AMD Wraith Prism";
+    vendor                      = "Cooler Master";
+    type                        = DEVICE_TYPE_COOLER;
+    description                 = "AMD Wraith Prism Device";
+    version                     = controller->GetFirmwareVersionString();
+    location                    = controller->GetLocationString();
 
     mode Direct;
     Direct.name                 = "Direct";
@@ -138,8 +140,8 @@ void RGBController_AMDWraithPrism::SetupZones()
     /*---------------------------------------------------------*\
     | LED maps                                                  |
     \*---------------------------------------------------------*/
-    const unsigned int logo_leds[1] =   { 0x00 };
-    const unsigned int fan_leds[1] =    { 0x01 };
+    const unsigned int logo_leds[1]  =  { 0x00 };
+    const unsigned int fan_leds[1]   =  { 0x01 };
     const unsigned int ring_leds[14] =  { 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x10, 0x0F,
                                           0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09 };
 
@@ -179,24 +181,24 @@ void RGBController_AMDWraithPrism::SetupZones()
     for(unsigned int led_idx = 0; led_idx < 1; led_idx++)
     {
         led logo_led;
-        logo_led.name = "Logo LED";
-        logo_led.value = logo_leds[led_idx];
+        logo_led.name       = "Logo LED";
+        logo_led.value      = logo_leds[led_idx];
         leds.push_back(logo_led);
     }
 
     for(unsigned int led_idx = 0; led_idx < 1; led_idx++)
     {
         led fan_led;
-        fan_led.name = "Fan LED";
-        fan_led.value = fan_leds[led_idx];
+        fan_led.name        = "Fan LED";
+        fan_led.value       = fan_leds[led_idx];
         leds.push_back(fan_led);
     }
 
     for(unsigned int led_idx = 0; led_idx < 14; led_idx++)
     {
         led ring_led;
-        ring_led.name = "Ring LED";
-        ring_led.value = ring_leds[led_idx];
+        ring_led.name       = "Ring LED";
+        ring_led.value      = ring_leds[led_idx];
         leds.push_back(ring_led);
     }
 

Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.h

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

Controllers/AOCKeyboardController/AOCKeyboardController.cpp

@@ -1,17 +1,19 @@
-/*-----------------------------------------*\
-|  AOCKeyboardController.cpp                |
-|                                           |
-|  Driver for AOC Keyboard lighting         |
-|  controller                               |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 5/10/2023   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| AOCKeyboardController.cpp                                 |
+|                                                           |
+|   Driver for AOC keyboard                                 |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                10 May 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
-#include "AOCKeyboardController.h"
-
-#include <cstring>
 #include <chrono>
+#include <cstring>
 #include <thread>
+#include "AOCKeyboardController.h"
+#include "StringUtils.h"
 
 using namespace std::chrono_literals;
 
@@ -41,10 +43,7 @@ std::string AOCKeyboardController::GetSerialString()
         return("");
     }
 
-    std::wstring return_wstring = serial_string;
-    std::string return_string(return_wstring.begin(), return_wstring.end());
-
-    return(return_string);
+    return(StringUtils::wstring_to_string(serial_string));
 }
 
 void AOCKeyboardController::SetLightingConfig

Controllers/AOCKeyboardController/AOCKeyboardController.h

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

Controllers/AOCKeyboardController/AOCKeyboardControllerDetect.cpp

@@ -1,10 +1,20 @@
+/*---------------------------------------------------------*\
+| AOCKeyboardControllerDetect.cpp                           |
+|                                                           |
+|   Detector for AOC keyboard                               |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                10 May 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #include "Detector.h"
 #include "AOCKeyboardController.h"
-#include "RGBController.h"
 #include "RGBController_AOCKeyboard.h"
 
 /*-----------------------------------------------------*\
-| AOC Mousemat IDs                                      |
+| AOC Keyboard IDs                                      |
 \*-----------------------------------------------------*/
 #define AOC_VID                                     0x3938
 #define AOC_GK500_PID                               0x1178
@@ -33,4 +43,4 @@ void DetectAOCKeyboardControllers(hid_device_info* info, const std::string& name
 }
 
 REGISTER_HID_DETECTOR_PU("AOC GK500",  DetectAOCKeyboardControllers,   AOC_VID,    AOC_GK500_PID,   0xFF19, 0xFF19);
-REGISTER_HID_DETECTOR_PU("AOC GK500",  DetectAOCKeyboardControllers,   AOC_VID,    AOC_GK500_PID_2,   0xFF19, 0xFF19);
+REGISTER_HID_DETECTOR_PU("AOC GK500",  DetectAOCKeyboardControllers,   AOC_VID,    AOC_GK500_PID_2, 0xFF19, 0xFF19);

Controllers/AOCKeyboardController/RGBController_AOCKeyboard.cpp

@@ -1,10 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_AOCKeyboard.cpp            |
-|                                           |
-|  Generic RGB Interface for AOC keyboard   |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 5/10/2023   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AOCKeyboard.cpp                             |
+|                                                           |
+|   RGBController for AOC keyboard                          |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                10 May 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "RGBController_AOCKeyboard.h"
 #include "KeyboardLayoutManager.h"
@@ -32,10 +35,10 @@ layout_values aoc_keyboard_offset_values =
             75,   76,   91,   62,   48,   64,   50,   65,   66,   67,   97,   68,   84,   70,   59,   74,   89,    58,   73,   88,  103,
         /* TAB     Q     W     E     R     T     Y     U     I     O     P     [     ]     \   DEL   END   PGDN   NP7   NP8   NP9   NP+ */
             60,   61,   47,   78,   33,   49,   35,   80,   51,   52,   53,   69,   99,   25,   44,   29,   14,    43,   28,   13,  102,
-        /* CPLK    A     S     D     F     G     H     J     K     L     ;     "   ENTR                           NP4   NP5   NP6       */
-            45,   46,   32,   93,   18,   34,   20,   95,   36,   37,   38,   54,   10,                            57,   72,   87,
-        /* LSFT    Z     X     C     V     B     N     M     ,     .     /   RSFT                   ARWU          NP1   NP2   NP3  NPEN */
-            30,   31,   17,    2,    3,   19,    5,    6,   21,   22,   23,   39,                     11,          42,   27,   12,  101,
+        /* CPLK    A     S     D     F     G     H     J     K     L     ;     "     #   ENTR                     NP4   NP5   NP6       */
+            45,   46,   32,   93,   18,   34,   20,   95,   36,   37,   38,   54,    0,   10,                      57,   72,   87,
+        /* LSFT    \     Z     X     C     V     B     N     M     ,     .     /   RSFT             ARWU          NP1   NP2   NP3  NPEN */
+            30,    0,   31,   17,    2,    3,   19,    5,    6,   21,   22,   23,   39,               11,          42,   27,   12,  101,
         /* LCTL  LWIN  LALT               SPC              RALT  RFNC  RMNU  RCTL              ARWL ARWD   ARWR   NP0         NP.       */
             15,    0,    1,                4,                7,    8,   24,    9,               26,   41,   56,    71,         86
     },
@@ -47,14 +50,14 @@ layout_values aoc_keyboard_offset_values =
 
 RGBController_AOCKeyboard::RGBController_AOCKeyboard(AOCKeyboardController* controller_ptr)
 {
-    controller  = controller_ptr;
+    controller                      = controller_ptr;
 
-    name        = "AOC Keyboard Device";
-    vendor      = "AOC";
-    type        = DEVICE_TYPE_KEYBOARD;
-    description = "AOC Keyboard Device";
-    location    = controller->GetDeviceLocation();
-    serial      = controller->GetSerialString();
+    name                            = "AOC Keyboard Device";
+    vendor                          = "AOC";
+    type                            = DEVICE_TYPE_KEYBOARD;
+    description                     = "AOC Keyboard Device";
+    location                        = controller->GetDeviceLocation();
+    serial                          = controller->GetSerialString();
 
     mode Static;
     Static.name                     = "Static";
@@ -288,7 +291,7 @@ void RGBController_AOCKeyboard::SetupZones()
     | Create LEDs for the Matrix zone                           |
     |   Place keys in the layout to populate the matrix         |
     \*---------------------------------------------------------*/
-    for(size_t led_idx = 0; led_idx < new_zone.leds_count; led_idx++)
+    for(unsigned int led_idx = 0; led_idx < new_zone.leds_count; led_idx++)
     {
         led new_led;
 
@@ -299,8 +302,6 @@ void RGBController_AOCKeyboard::SetupZones()
 
     zones.push_back(new_zone);
 
-
-
     SetupColors();
 }
 

Controllers/AOCKeyboardController/RGBController_AOCKeyboard.h

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

Controllers/AOCMouseController/AOCMouseController.cpp

@@ -1,14 +1,17 @@
-/*-----------------------------------------*\
-|  AOCMouseController.cpp                   |
-|                                           |
-|  Driver for AOC Mouse lighting controller |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 4/20/2023   |
-\*-----------------------------------------*/
-
-#include "AOCMouseController.h"
+/*---------------------------------------------------------*\
+| AOCMouseController.cpp                                    |
+|                                                           |
+|   Driver for AOC mouse                                    |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                20 Apr 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include <cstring>
+#include "AOCMouseController.h"
+#include "StringUtils.h"
 
 AOCMouseController::AOCMouseController(hid_device* dev_handle, const char* path)
 {
@@ -36,10 +39,7 @@ std::string AOCMouseController::GetSerialString()
         return("");
     }
 
-    std::wstring return_wstring = serial_string;
-    std::string return_string(return_wstring.begin(), return_wstring.end());
-
-    return(return_string);
+    return(StringUtils::wstring_to_string(serial_string));
 }
 
 /*-------------------------------------------------------------------------------------------------*\

Controllers/AOCMouseController/AOCMouseController.h

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

Controllers/AOCMouseController/AOCMouseControllerDetect.cpp

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

Controllers/AOCMouseController/RGBController_AOCMouse.cpp

@@ -1,10 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_AOCMouse.cpp               |
-|                                           |
-|  Generic RGB Interface for AOC mouse      |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 4/20/2023   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AOCMouse.cpp                                |
+|                                                           |
+|   RGBController for AOC mouse                             |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                20 Apr 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "RGBController_AOCMouse.h"
 
@@ -21,14 +24,14 @@
 
 RGBController_AOCMouse::RGBController_AOCMouse(AOCMouseController* controller_ptr)
 {
-    controller  = controller_ptr;
+    controller                      = controller_ptr;
 
-    name        = "AOC Mouse Device";
-    vendor      = "AOC";
-    type        = DEVICE_TYPE_MOUSE;
-    description = "AOC Mouse Device";
-    location    = controller->GetDeviceLocation();
-    serial      = controller->GetSerialString();
+    name                            = "AOC Mouse Device";
+    vendor                          = "AOC";
+    type                            = DEVICE_TYPE_MOUSE;
+    description                     = "AOC Mouse Device";
+    location                        = controller->GetDeviceLocation();
+    serial                          = controller->GetSerialString();
 
     mode Direct;
     Direct.name                     = "Direct";

Controllers/AOCMouseController/RGBController_AOCMouse.h

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

Controllers/AOCMousematController/AOCMousematController.cpp

@@ -1,15 +1,17 @@
-/*-----------------------------------------*\
-|  AOCMousematController.cpp                |
-|                                           |
-|  Driver for AOC Mousemat lighting         |
-|  controller                               |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 4/15/2023   |
-\*-----------------------------------------*/
-
-#include "AOCMousematController.h"
+/*---------------------------------------------------------*\
+| AOCMousematController.cpp                                 |
+|                                                           |
+|   Driver for AOC mousemat                                 |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Apr 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include <cstring>
+#include "AOCMousematController.h"
+#include "StringUtils.h"
 
 AOCMousematController::AOCMousematController(hid_device* dev_handle, const char* path)
 {
@@ -37,10 +39,7 @@ std::string AOCMousematController::GetSerialString()
         return("");
     }
 
-    std::wstring return_wstring = serial_string;
-    std::string return_string(return_wstring.begin(), return_wstring.end());
-
-    return(return_string);
+    return(StringUtils::wstring_to_string(serial_string));
 }
 
 /*-------------------------------------------------------------------------------------------------*\

Controllers/AOCMousematController/AOCMousematController.h

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

Controllers/AOCMousematController/AOCMousematControllerDetect.cpp

@@ -1,6 +1,16 @@
+/*---------------------------------------------------------*\
+| AOCMousematControllerDetect.cpp                           |
+|                                                           |
+|   Detector for AOC mousemat                               |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Apr 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #include "Detector.h"
 #include "AOCMousematController.h"
-#include "RGBController.h"
 #include "RGBController_AOCMousemat.h"
 
 /*-----------------------------------------------------*\
@@ -31,4 +41,4 @@ void DetectAOCMousematControllers(hid_device_info* info, const std::string& name
     }
 }
 
-REGISTER_HID_DETECTOR_IPU("AOC AGON AMM700",    DetectAOCMousematControllers,   AOC_VID,    AOC_AMM700_PID, 1,  0xFF19,  0xFF19);
+REGISTER_HID_DETECTOR_IPU("AOC AGON AMM700",    DetectAOCMousematControllers,   AOC_VID,    AOC_AMM700_PID, 1,  0xFF19,  0xFF19);

Controllers/AOCMousematController/RGBController_AOCMousemat.cpp

@@ -1,10 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_AOCMousemat.cpp            |
-|                                           |
-|  Generic RGB Interface for AOC mousemat   |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 4/15/2023   |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AOCMousemat.cpp                             |
+|                                                           |
+|   RGBController for AOC mousemat                          |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Apr 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "RGBController_AOCMousemat.h"
 
@@ -21,14 +24,14 @@
 
 RGBController_AOCMousemat::RGBController_AOCMousemat(AOCMousematController* controller_ptr)
 {
-    controller  = controller_ptr;
+    controller                      = controller_ptr;
 
-    name        = "AOC Mousemat Device";
-    vendor      = "AOC";
-    type        = DEVICE_TYPE_MOUSEMAT;
-    description = "AOC Mousemat Device";
-    location    = controller->GetDeviceLocation();
-    serial      = controller->GetSerialString();
+    name                            = "AOC Mousemat Device";
+    vendor                          = "AOC";
+    type                            = DEVICE_TYPE_MOUSEMAT;
+    description                     = "AOC Mousemat Device";
+    location                        = controller->GetDeviceLocation();
+    serial                          = controller->GetSerialString();
 
     mode Direct;
     Direct.name                     = "Direct";

Controllers/AOCMousematController/RGBController_AOCMousemat.h

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

Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.cpp

@@ -1,20 +1,22 @@
-/*-----------------------------------------*\
-|  ASRockPolychromeUSBController.cpp        |
-|                                           |
-|  Driver for ASRock Polychrome USB         |
-|  lighting controller                      |
-|                                           |
-|  Ed Kambulow (dredvard) 12/20/2020        |
-|  Shady Nawara (ShadyNawara) 01/16/2023    |
-\*-----------------------------------------*/
-#include <cstring>
-#include <stdio.h>
+/*---------------------------------------------------------*\
+| ASRockPolychromeUSBController.cpp                         |
+|                                                           |
+|   Driver for ASRock Polychrome USB motherboards           |
+|                                                           |
+|   Ed Kambulow (dredvard)                      20 Dec 2020 |
+|   Shady Nawara (ShadyNawara)                  16 Jan 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
+#include <cstring>
 #include "RGBController.h"
 #include "ResourceManager.h"
 #include "SettingsManager.h"
+#include "StringUtils.h"
 #include "ASRockPolychromeUSBController.h"
-#include "dependencies/dmiinfo.h"
+#include "dmiinfo.h"
 
 #define POLYCHROME_USB_READ_ZONE_CONFIG 0x11
 #define POLYCHROME_USB_READ_HEADER      0x14
@@ -55,7 +57,7 @@ PolychromeUSBController::~PolychromeUSBController()
 
 unsigned int PolychromeUSBController::GetChannelCount()
 {
-    return(device_info.size());
+    return((unsigned int)device_info.size());
 }
 
 std::string PolychromeUSBController::GetDeviceLocation()
@@ -78,10 +80,7 @@ std::string PolychromeUSBController::GetSerialString()
         return("");
     }
 
-    std::wstring return_wstring = serial_string;
-    std::string return_string(return_wstring.begin(), return_wstring.end());
-
-    return(return_string);
+    return(StringUtils::wstring_to_string(serial_string));
 }
 
 void PolychromeUSBController::SetDeviceInfo()
@@ -381,7 +380,7 @@ void PolychromeUSBController::WriteRGSwap
     bool chnl8
     )
 {
-    unsigned char rgconfig[1] = {static_cast<unsigned char>(((chnl8 << 7) | (pcb << 6) | (io << 5) | (pch << 4) | (ahdr1 << 3) | (ahdr0 << 2) | (hdr1 << 1) | hdr0))};
+    unsigned char rgconfig[1] = {static_cast<unsigned char>((((unsigned char)chnl8 << 7) | ((unsigned char)pcb << 6) | ((unsigned char)io << 5) | ((unsigned char)pch << 4) | ((unsigned char)ahdr1 << 3) | ((unsigned char)ahdr0 << 2) | ((unsigned char)hdr1 << 1) | (unsigned char)hdr0))};
     WriteHeader(POLYCHROME_USB_RGSWAP_CFG, rgconfig, 1);
 }
 

Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.h

@@ -1,19 +1,21 @@
-/*-----------------------------------------*\
-|  ASRockPolychromeUSBController.h          |
-|                                           |
-|  Driver for ASRock Polychrome USB         |
-|  lighting controller                      |
-|                                           |
-|  Ed Kambulow (dredvard) 12/20/2020        |
-|  Shady Nawara (ShadyNawara) 01/16/2023    |
-\*-----------------------------------------*/
-
-#include "RGBController.h"
-#include <hidapi/hidapi.h>
-#include <string>
+/*---------------------------------------------------------*\
+| ASRockPolychromeUSBController.h                           |
+|                                                           |
+|   Driver for ASRock Polychrome USB motherboards           |
+|                                                           |
+|   Ed Kambulow (dredvard)                      20 Dec 2020 |
+|   Shady Nawara (ShadyNawara)                  16 Jan 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #pragma once
 
+#include <string>
+#include <hidapi.h>
+#include "RGBController.h"
+
 /*----------------------------------------------------------------------------------------------*\
 | Definitions for Polychrome USB                                                                 |
 \*----------------------------------------------------------------------------------------------*/
@@ -154,12 +156,11 @@ protected:
         );
 
 private:
-    unsigned int  led_count;
     std::string   device_name;
     unsigned char configtable[12];
     bool          rgswapconfig[8] = { 0 };
 
-    void SetDeviceInfo();    
+    void SetDeviceInfo();
     void ReadConfigTables();
     void Commit();
 };

Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBControllerDetect.cpp

@@ -1,13 +1,19 @@
+/*---------------------------------------------------------*\
+| ASRockPolychromeUSBControllerDetect.cpp                   |
+|                                                           |
+|   Detector for ASRock Polychrome USB motherboards         |
+|                                                           |
+|   Ed Kambulow (dredvard)                      20 Dec 2020 |
+|   Shady Nawara (ShadyNawara)                  16 Jan 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include <hidapi.h>
 #include "Detector.h"
 #include "ASRockPolychromeUSBController.h"
-#include "RGBController.h"
 #include "RGBController_ASRockPolychromeUSB.h"
-#include "i2c_smbus.h"
-#include "pci_ids.h"
-#include <vector>
-#include <stdio.h>
-#include <stdlib.h>
-#include <hidapi/hidapi.h>
 
 /*---------------------------------------------------------*\
 | ASRock vendor ID                                          |
@@ -32,5 +38,5 @@ void DetectPolychromeUSBControllers(hid_device_info* info, const std::string& /*
     }
 }
 
-REGISTER_HID_DETECTOR("ASRock Polychrome USB", DetectPolychromeUSBControllers, ASROCK_VID, ASROCK_MOTHERBOARD_1_PID);
-REGISTER_HID_DETECTOR("ASRock Deskmini Addressable LED Strip", DetectPolychromeUSBControllers, ASROCK_VID, ASROCK_DESKMINI_ADDRESSABLE_LED_STRIP_PID);
+REGISTER_HID_DETECTOR("ASRock Polychrome USB",                  DetectPolychromeUSBControllers, ASROCK_VID, ASROCK_MOTHERBOARD_1_PID);
+REGISTER_HID_DETECTOR("ASRock Deskmini Addressable LED Strip",  DetectPolychromeUSBControllers, ASROCK_VID, ASROCK_DESKMINI_ADDRESSABLE_LED_STRIP_PID);

Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp

@@ -1,15 +1,17 @@
-/*-----------------------------------------*\
-|  RGBController_ASRockPolychromeUSB.cpp    |
-|                                           |
-|  Generic RGB Interface for OpenRGB        |
-|  ASRock Polychrome USB Driver             |
-|                                           |
-|  Ed Kambulow (Dredvard) 12/26/2020        |
-|  Shady Nawara (ShadyNawara) 01/16/2023    |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_ASRockPolychromeUSB.cpp                     |
+|                                                           |
+|   RGBController for ASRock Polychrome USB motherboards    |
+|                                                           |
+|   Ed Kambulow (dredvard)                      20 Dec 2020 |
+|   Shady Nawara (ShadyNawara)                  16 Jan 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
-#include "RGBController_ASRockPolychromeUSB.h"
 #include <string.h>
+#include "RGBController_ASRockPolychromeUSB.h"
 
 #define ASROCK_USB_MAX_ZONES        8
 #define ASROCK_ADDRESSABLE_MAX_LEDS 100
@@ -293,7 +295,7 @@ void RGBController_PolychromeUSB::DeviceUpdateLEDs()
             set_mode = active_mode;
         }
 
-        controller->WriteZone(zone_idx, set_mode, zones_info[zone_idx].speed, zones[zone_idx].colors[0], false);
+        controller->WriteZone((unsigned char)zone_idx, set_mode, zones_info[zone_idx].speed, zones[zone_idx].colors[0], false);
     }
 }
 

Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.h

@@ -1,12 +1,14 @@
-/*-----------------------------------------*\
-|  RGBController_ASRockPolychromeUSB.h      |
-|                                           |
-|  Generic RGB Interface for OpenRGB        |
-|  ASRock Polychrome USB Driver             |
-|                                           |
-|  Ed Kambulow (Dredvard) 12/26/2020        |
-|  Shady Nawara (ShadyNawara) 01/16/2023    |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_ASRockPolychromeUSB.h                       |
+|                                                           |
+|   RGBController for ASRock Polychrome USB motherboards    |
+|                                                           |
+|   Ed Kambulow (dredvard)                      20 Dec 2020 |
+|   Shady Nawara (ShadyNawara)                  16 Jan 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #pragma once
 
@@ -29,7 +31,6 @@ public:
     void        DeviceUpdateMode();
 
 private:
-    bool                            initializedMode;
     PolychromeUSBController*        controller;
     std::vector<PolychromeZoneInfo> zones_info;
 

Controllers/ASRockSMBusController/ASRockASRRGBSMBusController/ASRockASRRGBSMBusController.cpp

@@ -1,15 +1,17 @@
-/*-----------------------------------------*\
-|  ASRockPolychromeSMBusController.cpp      |
-|                                           |
-|  Driver for for ASRock ASR LED and        |
-|  Polychrome RGB lighting controller       |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/14/2019  |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| ASRockASRRGBSMBusController.cpp                           |
+|                                                           |
+|   Driver for SMBus ASRock ASR RGB motherboards            |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                14 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "ASRockASRRGBSMBusController.h"
 #include <cstring>
-#include "dependencies/dmiinfo.h"
+#include "dmiinfo.h"
 #include "LogManager.h"
 
 #define ASROCK_ZONE_LED_COUNT_MESSAGE_EN    "[%s] Zone %i LED count: %02d"
@@ -64,7 +66,7 @@ void ASRockASRRGBSMBusController::SetColorsAndSpeed(uint8_t led, uint8_t red, ui
 {
     uint8_t color_speed_pkt[4] = { red, green, blue, active_speed };
     uint8_t select_led_pkt[1]  = { led };
-    
+
     /*-----------------------------------------------------*\
     | Select LED                                            |
     \*-----------------------------------------------------*/

Controllers/ASRockSMBusController/ASRockASRRGBSMBusController/ASRockASRRGBSMBusController.h

@@ -1,18 +1,19 @@
-/*-----------------------------------------*\
-|  ASRockASRRGBSMBusController.h        |
-|                                           |
-|  Definitions and types for ASRock         |
-|  ASR LED and Polychrome RGB lighting      |
-|  controller                               |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/13/2019  |
-\*-----------------------------------------*/
-
-#include "i2c_smbus.h"
-#include <string>
+/*---------------------------------------------------------*\
+| ASRockASRRGBSMBusController.h                             |
+|                                                           |
+|   Driver for SMBus ASRock ASR RGB motherboards            |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                13 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #pragma once
 
+#include <string>
+#include "i2c_smbus.h"
+
 typedef uint8_t	polychrome_dev_id;
 
 #define ASROCK_ASR_CONTROLLER_NAME  "ASRock ASR RGB SMBus Controller"
@@ -63,7 +64,7 @@ public:
     uint8_t                 GetMode();
     void                    SetColorsAndSpeed(uint8_t led, uint8_t red, uint8_t green, uint8_t blue);
     void                    SetMode(uint8_t zone, uint8_t mode, uint8_t speed);
-    
+
     uint16_t                fw_version;
 
 private:

Controllers/ASRockSMBusController/ASRockASRRGBSMBusController/RGBController_ASRockASRRGBSMBus.cpp

@@ -1,11 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_ASRockPolychromeSMBus.cpp  |
-|                                           |
-|  Generic RGB Interface for OpenRGB        |
-|  ASRock ASR LED and Polychrome RGB Driver |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/15/2019  |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_ASRRGBSMBus.cpp                             |
+|                                                           |
+|   RGBController for SMBus ASRock ASR LED motherboards     |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "RGBController_ASRockASRRGBSMBus.h"
 
@@ -167,7 +169,7 @@ void RGBController_ASRockASRRGBSMBus::ResizeZone(int /*zone*/, int /*new_size*/)
 
 void RGBController_ASRockASRRGBSMBus::DeviceUpdateLEDs()
 {
-    for (std::size_t led = 0; led < colors.size(); led++)
+    for(unsigned int led = 0; led < colors.size(); led++)
     {
         UpdateSingleLED(led);
     }

Controllers/ASRockSMBusController/ASRockASRRGBSMBusController/RGBController_ASRockASRRGBSMBus.h

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------*\
+| RGBController_ASRRGBSMBus.h                               |
+|                                                           |
+|   RGBController for SMBus ASRock ASR RGB motherboards     |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "ASRockASRRGBSMBusController.h"
+
+class RGBController_ASRockASRRGBSMBus : public RGBController
+{
+public:
+    RGBController_ASRockASRRGBSMBus(ASRockASRRGBSMBusController* controller_ptr);
+    ~RGBController_ASRockASRRGBSMBus();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+private:
+    ASRockASRRGBSMBusController* controller;
+};

Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController/ASRockPolychromeV1SMBusController.cpp

@@ -1,15 +1,17 @@
-/*-----------------------------------------*\
-|  ASRockPolychromeV1SMBusController.cpp    |
-|                                           |
-|  Driver for for ASRock ASR LED and        |
-|  Polychrome RGB lighting controller       |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/14/2019  |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| ASRockPolychromeV1SMBusController.cpp                     |
+|                                                           |
+|   Driver for SMBus ASRock Polychrome V1 motherboards      |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                14 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
-#include "ASRockPolychromeV1SMBusController.h"
 #include <cstring>
-#include "dependencies/dmiinfo.h"
+#include "ASRockPolychromeV1SMBusController.h"
+#include "dmiinfo.h"
 #include "LogManager.h"
 
 #define ASROCK_ZONE_LED_COUNT_MESSAGE_EN    "[%s] Zone %i LED count: %02d"

Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController/ASRockPolychromeV1SMBusController.h

@@ -1,19 +1,20 @@
-/*-----------------------------------------*\
-|  ASRockPolychromeV1SMBusController.h      |
-|                                           |
-|  Definitions and types for ASRock         |
-|  ASR LED and Polychrome RGB lighting      |
-|  controller                               |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/13/2019  |
-\*-----------------------------------------*/
-
-#include "i2c_smbus.h"
-#include "RGBController.h"
-#include <string>
+/*---------------------------------------------------------*\
+| ASRockPolychromeV1SMBusController.h                       |
+|                                                           |
+|   Driver for SMBus ASRock Polychrome V1 motherboards      |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                13 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #pragma once
 
+#include <string>
+#include "i2c_smbus.h"
+#include "RGBController.h"
+
 typedef uint8_t	polychrome_dev_id;
 
 #define ASROCK_V1_CONTROLLER_NAME  "ASRock Polychrome v1 SMBus Controller"

Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController/RGBController_ASRockPolychromeV1SMBus.cpp

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

Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController/RGBController_ASRockPolychromeV1SMBus.h

@@ -0,0 +1,38 @@
+/*---------------------------------------------------------*\
+| RGBController_ASRockPolychromeV1SMBus.h                   |
+|                                                           |
+|   RGBController for SMBus ASRock Polychrome V1            |
+|   motherboards                                            |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "ASRockPolychromeV1SMBusController.h"
+
+class RGBController_ASRockPolychromeV1SMBus : public RGBController
+{
+public:
+    RGBController_ASRockPolychromeV1SMBus(ASRockPolychromeV1SMBusController* controller_ptr);
+    ~RGBController_ASRockPolychromeV1SMBus();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+private:
+    ASRockPolychromeV1SMBusController* controller;
+    uint8_t                 getModeIndex(uint8_t mode_value);
+    std::vector<uint8_t>    zoneIndexMap;
+};

Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/ASRockPolychromeV2SMBusController.cpp

@@ -1,15 +1,17 @@
-/*-----------------------------------------*\
-|  ASRockPolychromeV2SMBusController.cpp    |
-|                                           |
-|  Driver for for ASRock ASR LED and        |
-|  Polychrome RGB lighting controller       |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/14/2019  |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| ASRockPolychromeV2SMBusController.cpp                     |
+|                                                           |
+|   Driver for SMBus ASRock Polychrome V2 motherboards      |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                14 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
-#include "ASRockPolychromeV2SMBusController.h"
 #include <cstring>
-#include "dependencies/dmiinfo.h"
+#include "ASRockPolychromeV2SMBusController.h"
+#include "dmiinfo.h"
 #include "LogManager.h"
 
 #define ASROCK_ZONE_LED_COUNT_MESSAGE_EN    "[%s] Zone %i LED count: %02d"

Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/ASRockPolychromeV2SMBusController.h

@@ -1,18 +1,19 @@
-/*-----------------------------------------*\
-|  ASRockPolychromeSMBusController.h        |
-|                                           |
-|  Definitions and types for ASRock         |
-|  ASR LED and Polychrome RGB lighting      |
-|  controller                               |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/13/2019  |
-\*-----------------------------------------*/
-
-#include "i2c_smbus.h"
-#include <string>
+/*---------------------------------------------------------*\
+| ASRockPolychromeV2SMBusController.h                       |
+|                                                           |
+|   Driver for SMBus ASRock Polychrome V2 motherboards      |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                13 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #pragma once
 
+#include <string>
+#include "i2c_smbus.h"
+
 typedef uint8_t polychrome_dev_id;
 
 #define ASROCK_V2_CONTROLLER_NAME  "ASRock Polychrome v2 SMBus Controller"
@@ -132,7 +133,7 @@ public:
 
     uint8_t                 zone_led_count[6];
     uint16_t                fw_version;
-    
+
 private:
     std::string             device_name;
     uint8_t                 active_zone;

Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/RGBController_ASRockPolychromeV2SMBus.cpp

@@ -1,11 +1,14 @@
-/*-----------------------------------------*\
-|  RGBController_ASRockPolychromeV2SMBus.cpp|
-|                                           |
-|  Generic RGB Interface for OpenRGB        |
-|  ASRock ASR LED and Polychrome RGB Driver |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 12/15/2019  |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_ASRockPolychromeV2SMBus.cpp                 |
+|                                                           |
+|   RGBController for SMBus ASRock Polychrome V2            |
+|   motherboards                                            |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "RGBController_ASRockPolychromeV2SMBus.h"
 
@@ -287,7 +290,7 @@ void RGBController_ASRockPolychromeV2SMBus::ResizeZone(int /*zone*/, int /*new_s
 
 void RGBController_ASRockPolychromeV2SMBus::DeviceUpdateLEDs()
 {
-    for (std::size_t led = 0; led < colors.size(); led++)
+    for(unsigned int led = 0; led < colors.size(); led++)
     {
         UpdateSingleLED(led);
     }

Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/RGBController_ASRockPolychromeV2SMBus.h

@@ -0,0 +1,36 @@
+/*---------------------------------------------------------*\
+| RGBController_ASRockPolychromeV2SMBus.h                   |
+|                                                           |
+|   RGBController for SMBus ASRock Polychrome V2            |
+|   motherboards                                            |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                15 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "ASRockPolychromeV2SMBusController.h"
+
+class RGBController_ASRockPolychromeV2SMBus : public RGBController
+{
+public:
+    RGBController_ASRockPolychromeV2SMBus(ASRockPolychromeV2SMBusController* controller_ptr);
+    ~RGBController_ASRockPolychromeV2SMBus();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+private:
+    ASRockPolychromeV2SMBusController* controller;
+};

Controllers/ASRockSMBusController/ASRockSMBusControllerDetect.cpp

@@ -1,17 +1,26 @@
+/*---------------------------------------------------------*\
+| ASRockSMBusControllerDetect.cpp                           |
+|                                                           |
+|   Detector for SMBus ASRock ASR RGB and Polychrome        |
+|   motherboards                                            |
+|                                                           |
+|   Adam Honse (CalcProgrammer1)                14 Dec 2019 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include <vector>
 #include "Detector.h"
 #include "ASRockASRRGBSMBusController.h"
 #include "ASRockPolychromeV1SMBusController.h"
 #include "ASRockPolychromeV2SMBusController.h"
 #include "LogManager.h"
-#include "RGBController.h"
 #include "RGBController_ASRockASRRGBSMBus.h"
 #include "RGBController_ASRockPolychromeV1SMBus.h"
 #include "RGBController_ASRockPolychromeV2SMBus.h"
 #include "i2c_smbus.h"
 #include "pci_ids.h"
-#include <vector>
-#include <stdio.h>
-#include <stdlib.h>
 
 /*******************************************************************************************\
 *                                                                                           *

Controllers/ASRockSMBusController/RGBController_ASRockASRRGBSMBus.h

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

Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV1SMBus.h

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

Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV2SMBus.h

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

Controllers/AlienwareController/AlienwareController.cpp

@@ -1,13 +1,14 @@
-/*-----------------------------------------*\
-|  AlienwareController.cpp                  |
-|                                           |
-|  Driver for Alienware lighting controller |
-|                                           |
-|  Gabriel Marcano (gemarcano) 4/21/2021    |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| AlienwareController.cpp                                   |
+|                                                           |
+|   Driver for Dell Alienware RGB USB controller            |
+|                                                           |
+|   Gabriel Marcano (gemarcano)                 21 Apr 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
-#include "RGBController.h"
-#include "AlienwareController.h"
 #include <cstring>
 #include <cstdint>
 #include <map>
@@ -15,7 +16,10 @@
 #include <chrono>
 #include <algorithm>
 #include <sstream>
+#include "RGBController.h"
+#include "AlienwareController.h"
 #include "LogManager.h"
+#include "StringUtils.h"
 
 typedef uint32_t alienware_platform_id;
 
@@ -27,7 +31,8 @@ static const std::map<alienware_platform_id, uint8_t> zone_quirks_table =
 {
     { 0x0C01,   4 },    // Dell G5 SE 5505
     { 0x0A01,  16 },    // Dell G7 15 7500
-    { 0x0E03,   4 }     // Dell G15   5511
+    { 0x0E03,   4 },    // Dell G15   5511
+    { 0x0E0A,   4 }     // Dell G15   5530
 
 };
 
@@ -43,7 +48,8 @@ static const std::map<alienware_platform_id, std::vector<const char*>> zone_name
                   "Light Bar 4",    "Light Bar 5",  "Light Bar 6",
                   "Light Bar 7",    "Light Bar 8",  "Light Bar 9",
                   "Light Bar 10",   "Light Bar 11", "Light Bar 12"              } },
-    { 0x0E03,   { "Left",           "Middle",       "Right",        "Numpad"    } }
+    { 0x0E03,   { "Left",           "Middle",       "Right",        "Numpad"    } },
+    { 0x0E0A,   { "Left",           "Middle",       "Right",        "Numpad"    } }
 };
 
 static void SendHIDReport(hid_device *dev, const unsigned char* usb_buf, size_t usb_buf_size)
@@ -84,9 +90,7 @@ AlienwareController::AlienwareController(hid_device* dev_handle, const hid_devic
     /*-----------------------------------------------------*\
     | Get serial number                                     |
     \*-----------------------------------------------------*/
-    std::wstring tmp_serial_number;
-    tmp_serial_number   = info.serial_number;
-    serial_number       = std::string(tmp_serial_number.begin(), tmp_serial_number.end());
+    serial_number       = StringUtils::wstring_to_string(info.serial_number);
 
     /*-----------------------------------------------------*\
     | Get zone information by checking firmware             |
@@ -95,6 +99,11 @@ AlienwareController::AlienwareController(hid_device* dev_handle, const hid_devic
     report              = Report(ALIENWARE_COMMAND_REPORT_CONFIG);
     alienware_platform_id platform_id = report.data[4] << 8 | report.data[5];
 
+    /*-----------------------------------------------------*\
+    | Check if the device reports the wrong number of zones |
+    \*-----------------------------------------------------*/
+    unsigned number_of_zones = zone_quirks_table.count(platform_id) ? zone_quirks_table.at(platform_id) : report.data[6];
+
     /*-----------------------------------------------------*\
     | Get firmware version                                  |
     \*-----------------------------------------------------*/
@@ -105,11 +114,6 @@ AlienwareController::AlienwareController(hid_device* dev_handle, const hid_devic
     fw_string << static_cast<unsigned>(report.data[4]) << '.' << static_cast<unsigned>(report.data[5]) << '.' << static_cast<unsigned>(report.data[6]);
     version             = fw_string.str();
 
-    /*-----------------------------------------------------*\
-    | Check if the device reports the wrong number of zones |
-    \*-----------------------------------------------------*/
-    unsigned number_of_zones = zone_quirks_table.count(platform_id) ? zone_quirks_table.at(platform_id) : report.data[6];
-
     /*-----------------------------------------------------*\
     | Initialize Alienware zones                            |
     \*-----------------------------------------------------*/
@@ -167,7 +171,7 @@ AlienwareController::~AlienwareController()
 
 unsigned int AlienwareController::GetZoneCount()
 {
-    return(zones.size());
+    return((unsigned int)zones.size());
 }
 
 std::vector<const char*> AlienwareController::GetZoneNames()
@@ -272,7 +276,7 @@ bool AlienwareController::Dim(std::vector<uint8_t> zones, double percent)
     /*-----------------------------------------------------*\
     | Set up message packet with leading 00, per hidapi     |
     \*-----------------------------------------------------*/
-    uint16_t num_zones  = zones.size();
+    uint16_t num_zones  = (uint16_t)zones.size();
 
     usb_buf[0x00]       = 0x00;
     usb_buf[0x01]       = 0x03;
@@ -376,7 +380,7 @@ bool AlienwareController::SelectZones(const std::vector<uint8_t>& zones)
     /*-----------------------------------------------------*\
     | Set up message packet with leading 00, per hidapi     |
     \*-----------------------------------------------------*/
-    uint16_t num_zones  = zones.size();
+    uint16_t num_zones  = (uint16_t)zones.size();
 
     usb_buf[0x00]       = 0x00;
     usb_buf[0x01]       = 0x03;
@@ -515,7 +519,7 @@ bool AlienwareController::SetColorDirect(RGBColor color, std::vector<uint8_t> zo
     /*-----------------------------------------------------*\
     | Set up message packet with leading 00, per hidapi     |
     \*-----------------------------------------------------*/
-    uint16_t num_zones      = zones.size();
+    uint16_t num_zones      = (uint16_t)zones.size();
 
     usb_buf[0x00]           = 0x00;
     usb_buf[0x01]           = 0x03;
@@ -651,7 +655,7 @@ void AlienwareController::UpdateDim()
 
     for(size_t i = 0; i < zones.size(); i++)
     {
-        dim_zone_map[zones[i].dim].emplace_back(i);
+        dim_zone_map[zones[i].dim].emplace_back((uint8_t)i);
     }
 
     for(std::pair<const uint8_t, std::vector<uint8_t>> &pair : dim_zone_map)
@@ -678,7 +682,7 @@ bool AlienwareController::UpdateDirect()
 
     for(size_t i = 0; i < zones.size(); i++)
     {
-        color_zone_map[zones[i].color[0]].emplace_back(i);
+        color_zone_map[zones[i].color[0]].emplace_back((uint8_t)i);
     }
 
     for(std::pair<const RGBColor, std::vector<uint8_t>> &pair : color_zone_map)

Controllers/AlienwareController/AlienwareController.h

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

Controllers/AlienwareController/AlienwareControllerDetect.cpp

@@ -1,6 +1,14 @@
+/*---------------------------------------------------------*\
+| AlienwareControllerDetect.cpp                             |
+|                                                           |
+|   Detector for Dell Alienware RGB USB controller          |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #include "Detector.h"
 #include "AlienwareController.h"
-#include "RGBController.h"
 #include "RGBController_Alienware.h"
 
 /*---------------------------------------------------------*\
@@ -11,7 +19,8 @@
 /*---------------------------------------------------------*\
 | Alienware product ID                                      |
 \*---------------------------------------------------------*/
-#define ALIENWARE_G_SERIES_PID                         0x0550
+#define ALIENWARE_G_SERIES_PID1                      0x0550
+#define ALIENWARE_G_SERIES_PID2                      0x0551
 
 void DetectAlienwareControllers(hid_device_info* info, const std::string& name)
 {
@@ -26,4 +35,5 @@ void DetectAlienwareControllers(hid_device_info* info, const std::string& name)
     }
 }
 
-REGISTER_HID_DETECTOR("Dell G Series LED Controller", DetectAlienwareControllers, ALIENWARE_VID, ALIENWARE_G_SERIES_PID);
+REGISTER_HID_DETECTOR("Dell G Series LED Controller", DetectAlienwareControllers, ALIENWARE_VID, ALIENWARE_G_SERIES_PID1);
+REGISTER_HID_DETECTOR("Dell G Series LED Controller", DetectAlienwareControllers, ALIENWARE_VID, ALIENWARE_G_SERIES_PID2);

Controllers/AlienwareController/RGBController_Alienware.cpp

@@ -1,16 +1,17 @@
-/*-----------------------------------------*\
-|  RGBController_Alienware.cpp              |
-|                                           |
-|  Generic RGB Interface for OpenRGB        |
-|  Alienware USB Driver                     |
-|                                           |
-|  Gabriel Marcano (gemarcano) 4/19/2021    |
-\*-----------------------------------------*/
-
-#include "RGBController_Alienware.h"
+/*---------------------------------------------------------*\
+| RGBController_Alienware.cpp                               |
+|                                                           |
+|   RGBController for Dell Alienware RGB USB controller     |
+|                                                           |
+|   Gabriel Marcano (gemarcano)                 19 Apr 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include <thread>
 #include <chrono>
+#include "RGBController_Alienware.h"
 
 /**------------------------------------------------------------------*\
     @name Alienware
@@ -213,7 +214,7 @@ void RGBController_Alienware::DeviceUpdateMode()
         /*-----------------------------------------------------*\
         | Setup state per zone                                  |
         \*-----------------------------------------------------*/
-        for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
+        for(uint8_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
         {
             zone current_zone = zones[zone_idx];
 

Controllers/AlienwareController/RGBController_Alienware.h

@@ -1,19 +1,20 @@
-/*-----------------------------------------*\
-|  RGBController_Alienware.h                |
-|                                           |
-|  Generic RGB Interface for OpenRGB        |
-|  Alienware RGB USB Driver                 |
-|                                           |
-|  Gabriel Marcano (gemarcano) 4/19/2021    |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_Alienware.h                                 |
+|                                                           |
+|   RGBController for Dell Alienware RGB USB controller     |
+|                                                           |
+|   Gabriel Marcano (gemarcano)                 19 Apr 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #pragma once
 
+#include <chrono>
 #include "RGBController.h"
 #include "AlienwareController.h"
 
-#include <chrono>
-
 class RGBController_Alienware : public RGBController
 {
 public:

Controllers/AlienwareKeyboardController/AlienwareAW410KController/AlienwareAW410KController.cpp

@@ -1,16 +1,18 @@
-/*------------------------------------------------------*\
-|  AlienwareAW410KController.cpp                         |
-|                                                        |
-|  Driver for Alienware AW410K                           |
-|  keyboard light controller                             |
-|                                                        |
-|  based on AW510K controller by Mohamad Sallal - msallal|
-|                                                        |
-|  Dominik Mikolajczyk - dmiko 23/10/2023                |
-\*------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| AlienwareAW410KController.cpp                             |
+|                                                           |
+|   Driver for Alienware AW410K keyboard                    |
+|                                                           |
+|   based on AW510K controller by Mohamad Sallal (msallal)  |
+|   Dominik Mikolajczyk (dmiko)                 23 Oct 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
-#include "AlienwareAW410KController.h"
 #include <cstring>
+#include "AlienwareAW410KController.h"
+#include "StringUtils.h"
 
 AlienwareAW410KController::AlienwareAW410KController(hid_device* dev_handle, const char* path)
 {
@@ -34,20 +36,18 @@ std::string AlienwareAW410KController::GetSerialString()
 {
     wchar_t serial_string[128];
     int ret = hid_get_serial_number_string(dev, serial_string, 128);
+
     if(ret != 0)
     {
         return("");
     }
 
-    std::wstring return_wstring = serial_string;
-    std::string return_string(return_wstring.begin(), return_wstring.end());
-
-    return(return_string);
+    return(StringUtils::wstring_to_string(serial_string));
 }
 
 void AlienwareAW410KController::SendCommit()
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];
 
     /*-----------------------------------------------------*\
     | Zero out buffer                                       |
@@ -69,7 +69,7 @@ void AlienwareAW410KController::SendCommit()
     /*-----------------------------------------------------*\
     | Send packet                                           |
     \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);
 
     /*-----------------------------------------------------*\
     | Delay 20 milliseconds                                 |
@@ -77,7 +77,6 @@ void AlienwareAW410KController::SendCommit()
     std::this_thread::sleep_for(std::chrono::milliseconds(20));
 }
 
-
 void AlienwareAW410KController::SendfeatureReport
     (
     unsigned char   first_byte,
@@ -86,7 +85,7 @@ void AlienwareAW410KController::SendfeatureReport
     unsigned char   forth_byte
     )
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];
 
     /*-----------------------------------------------------*\
     | Zero out buffer                                       |
@@ -105,7 +104,7 @@ void AlienwareAW410KController::SendfeatureReport
     /*-----------------------------------------------------*\
     | Send Feature report packet                            |
     \*-----------------------------------------------------*/
-    hid_send_feature_report(dev, (unsigned char *)usb_buf, 65);
+    hid_send_feature_report(dev, usb_buf, 65);
 
     /*-----------------------------------------------------*\
     | Delay 10 milliseconds                                 |
@@ -115,7 +114,7 @@ void AlienwareAW410KController::SendfeatureReport
 
 void AlienwareAW410KController::SendEdit()
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];
 
     /*-----------------------------------------------------*\
     | Zero out buffer                                       |
@@ -133,7 +132,7 @@ void AlienwareAW410KController::SendEdit()
     /*-----------------------------------------------------*\
     | Send packet                                           |
     \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);
 
     /*-----------------------------------------------------*\
     | Delay 2 milliseconds                                  |
@@ -143,7 +142,7 @@ void AlienwareAW410KController::SendEdit()
 
 void AlienwareAW410KController::SendInitialize()
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];
 
     /*-----------------------------------------------------*\
     | Zero out buffer                                       |
@@ -168,7 +167,7 @@ void AlienwareAW410KController::SendInitialize()
     /*-----------------------------------------------------*\
     | Send packet                                           |
     \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);
 
     /*-----------------------------------------------------*\
     | Delay 2 milliseconds                                  |
@@ -222,7 +221,7 @@ void AlienwareAW410KController::SendDirectOn
     std::vector<SelectedButtons>     &frame_data
     )
 {
-    SendfeatureReport(0x0E, frame_data.size(), 0x00, 0x01);
+    SendfeatureReport(0x0E, (unsigned char)frame_data.size(), 0x00, 0x01);
 
     /*-----------------------------------------------*\
     | To Guarantee the data are always %4 =0 append   |
@@ -302,7 +301,7 @@ void AlienwareAW410KController::SendDirectOn
 void AlienwareAW410KController::SetMode
     (
     unsigned char   mode,
-    unsigned short  speed,
+    unsigned char   speed,
     unsigned char   direction,
     unsigned char   colorMode,
     unsigned char   red,
@@ -324,7 +323,7 @@ void AlienwareAW410KController::UpdateSingleLED
 {
     SendfeatureReport(0x0E, 0x01, 0x00, 0x01);
 
-    char usb_buf[65];
+    unsigned char usb_buf[65];
 
     /*-----------------------------------------------------*\
     | Zero out buffer                                       |
@@ -354,7 +353,7 @@ void AlienwareAW410KController::UpdateSingleLED
     /*-----------------------------------------------------*\
     | Send packet                                           |
     \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);
 
     /*-----------------------------------------------------*\
     | Delay 20 milliseconds                                 |
@@ -366,7 +365,7 @@ void AlienwareAW410KController::SendMode
     (
     unsigned char   /*zone*/,
     unsigned char   mode,
-    unsigned short  speed,
+    unsigned char   speed,
     unsigned char   direction,
     unsigned char   colorMode,
     unsigned char   red,
@@ -374,7 +373,7 @@ void AlienwareAW410KController::SendMode
     unsigned char   blue
     )
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];
 
     /*-----------------------------------------------------*\
     | Zero out buffer                                       |
@@ -400,13 +399,13 @@ void AlienwareAW410KController::SendMode
     /*-----------------------------------------------------*\
     | Send packet                                           |
     \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);
 }
 
 void AlienwareAW410KController::SetMorphMode
     (
     unsigned char   mode,
-    unsigned short  speed,
+    unsigned char   speed,
     unsigned char   red1,
     unsigned char   green1,
     unsigned char   blue1,
@@ -415,7 +414,7 @@ void AlienwareAW410KController::SetMorphMode
     unsigned char   blue2
     )
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];
 
     /*-----------------------------------------------------*\
     | Zero out buffer                                       |
@@ -444,5 +443,5 @@ void AlienwareAW410KController::SetMorphMode
     /*-----------------------------------------------------*\
     | Send packet                                           |
     \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);
 }

Controllers/AlienwareKeyboardController/AlienwareAW410KController/AlienwareAW410KController.h

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

Controllers/AlienwareKeyboardController/AlienwareAW410KController/RGBController_AlienwareAW410K.cpp

@@ -1,17 +1,18 @@
-/*------------------------------------------------------*\
-|  RGBController_AlienwareAW410K.cpp                     |
-|                                                        |
-|  Generic RGB Interface for alienware                   |
-|  AW410K Keyboard                                       |
-|                                                        |
-|  based on AW510K controller by Mohamad Sallal - msallal|
-|                                                        |
-|  Dominik Mikolajczyk - dmiko 23/10/2023                |
-\*------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AlienwareAW410K.cpp                         |
+|                                                           |
+|   RGBController for Alienware AW410K keyboard             |
+|                                                           |
+|   based on AW510K controller by Mohamad Sallal (msallal)  |
+|   Dominik Mikolajczyk (dmiko)                 23 Oct 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
+#include <iterator>
 #include "RGBControllerKeyNames.h"
 #include "RGBController_AlienwareAW410K.h"
-#include <iterator>
 
 //0xFFFFFFFF indicates an unused entry in matrix
 #define NA  0xFFFFFFFF
@@ -410,7 +411,7 @@ void RGBController_AlienwareAW410K::DeviceUpdateMode()
             | Load LEDs again in case of profile load etc.                  |
             \*-------------------------------------------------------------*/
             DeviceUpdateLEDs();
-            break;  
+            break;
         case ALIENWARE_AW410K_MODE_MORPH:
             /*-------------------------------------------------------------*\
             | In case of morph it requires two colors (color1 and color2)   |

Controllers/AlienwareKeyboardController/AlienwareAW410KController/RGBController_AlienwareAW410K.h

@@ -0,0 +1,37 @@
+/*---------------------------------------------------------*\
+| RGBController_AlienwareAW410K.h                           |
+|                                                           |
+|   RGBController for Alienware AW410K keyboard             |
+|                                                           |
+|   based on AW510K controller by Mohamad Sallal (msallal)  |
+|   Dominik Mikolajczyk (dmiko)                 23 Oct 2023 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "AlienwareAW410KController.h"
+
+class RGBController_AlienwareAW410K : public RGBController
+{
+public:
+    RGBController_AlienwareAW410K(AlienwareAW410KController* controller_ptr);
+    ~RGBController_AlienwareAW410K();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        DeviceUpdateMode();
+
+private:
+    AlienwareAW410KController*  controller;
+    std::vector<RGBColor>       current_colors;
+};

Controllers/AlienwareKeyboardController/AlienwareAW510KController/AlienwareAW510KController.cpp

@@ -1,14 +1,17 @@
-/*-----------------------------------------*\
-|  AlienwareAW510KController.cpp            |
-|                                           |
-|  Driver for Alienware AW510K              |
-|  keyboard light controller                |
-|                                           |
-|  Mohamad Sallal - msallal      05/22/2021 |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| AlienwareAW510KController.cpp                             |
+|                                                           |
+|   Driver for Alienware AW510K keyboard                    |
+|                                                           |
+|   Mohamad Sallal (msallal)                    22 May 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
-#include "AlienwareAW510KController.h"
 #include <cstring>
+#include "AlienwareAW510KController.h"
+#include "StringUtils.h"
 
 AlienwareAW510KController::AlienwareAW510KController(hid_device* dev_handle, const char* path)
 {
@@ -31,17 +34,19 @@ std::string AlienwareAW510KController::GetDeviceLocation()
 std::string AlienwareAW510KController::GetSerialString()
 {
     wchar_t serial_string[128];
-    hid_get_serial_number_string(dev, serial_string, 128);
+    int ret = hid_get_serial_number_string(dev, serial_string, 128);
 
-    std::wstring return_wstring = serial_string;
-    std::string return_string(return_wstring.begin(), return_wstring.end());
+    if(ret != 0)
+    {
+        return("");
+    }
 
-    return(return_string);
+    return(StringUtils::wstring_to_string(serial_string));
 }
 
 void AlienwareAW510KController::SendCommit()
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];
 
     /*-----------------------------------------------------*\
     | Zero out buffer                                       |
@@ -63,7 +68,7 @@ void AlienwareAW510KController::SendCommit()
     /*-----------------------------------------------------*\
     | Send packet                                           |
     \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);
 
     /*-----------------------------------------------------*\
     | Delay 20 milliseconds                                 |
@@ -71,7 +76,6 @@ void AlienwareAW510KController::SendCommit()
     std::this_thread::sleep_for(std::chrono::milliseconds(20));
 }
 
-
 void AlienwareAW510KController::SendfeatureReport
     (
     unsigned char   first_byte,
@@ -80,7 +84,7 @@ void AlienwareAW510KController::SendfeatureReport
     unsigned char   forth_byte
     )
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];
 
     /*-----------------------------------------------------*\
     | Zero out buffer                                       |
@@ -99,7 +103,7 @@ void AlienwareAW510KController::SendfeatureReport
     /*-----------------------------------------------------*\
     | Send Feature report packet                            |
     \*-----------------------------------------------------*/
-    hid_send_feature_report(dev, (unsigned char *)usb_buf, 65);
+    hid_send_feature_report(dev, usb_buf, 65);
 
     /*-----------------------------------------------------*\
     | Delay 10 milliseconds                                 |
@@ -109,7 +113,7 @@ void AlienwareAW510KController::SendfeatureReport
 
 void AlienwareAW510KController::SendEdit()
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];
 
     /*-----------------------------------------------------*\
     | Zero out buffer                                       |
@@ -127,7 +131,7 @@ void AlienwareAW510KController::SendEdit()
     /*-----------------------------------------------------*\
     | Send packet                                           |
     \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);
 
     /*-----------------------------------------------------*\
     | Delay 2 milliseconds                                  |
@@ -137,7 +141,7 @@ void AlienwareAW510KController::SendEdit()
 
 void AlienwareAW510KController::SendInitialize()
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];
 
     /*-----------------------------------------------------*\
     | Zero out buffer                                       |
@@ -162,7 +166,7 @@ void AlienwareAW510KController::SendInitialize()
     /*-----------------------------------------------------*\
     | Send packet                                           |
     \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);
 
     /*-----------------------------------------------------*\
     | Delay 2 milliseconds                                  |
@@ -216,7 +220,7 @@ void AlienwareAW510KController::SendDirectOn
     std::vector<SelectedKeys>     &frame_data
     )
 {
-    SendfeatureReport(0x0E, frame_data.size(), 0x00, 0x01);
+    SendfeatureReport(0x0E, (unsigned char)frame_data.size(), 0x00, 0x01);
 
     /*-----------------------------------------------*\
     | To Guarantee the data are always %4 =0 append   |
@@ -296,7 +300,7 @@ void AlienwareAW510KController::SendDirectOn
 void AlienwareAW510KController::SetMode
     (
     unsigned char   mode,
-    unsigned short  speed,
+    unsigned char   speed,
     unsigned char   direction,
     unsigned char   colorMode,
     unsigned char   red,
@@ -318,7 +322,7 @@ void AlienwareAW510KController::UpdateSingleLED
 {
     SendfeatureReport(0x0E, 0x01, 0x00, 0x01);
 
-    char usb_buf[65];
+    unsigned char usb_buf[65];
 
     /*-----------------------------------------------------*\
     | Zero out buffer                                       |
@@ -348,7 +352,7 @@ void AlienwareAW510KController::UpdateSingleLED
     /*-----------------------------------------------------*\
     | Send packet                                           |
     \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);
 
     /*-----------------------------------------------------*\
     | Delay 20 milliseconds                                 |
@@ -360,7 +364,7 @@ void AlienwareAW510KController::SendMode
     (
     unsigned char   /*zone*/,
     unsigned char   mode,
-    unsigned short  speed,
+    unsigned char   speed,
     unsigned char   direction,
     unsigned char   colorMode,
     unsigned char   red,
@@ -368,7 +372,7 @@ void AlienwareAW510KController::SendMode
     unsigned char   blue
     )
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];
 
     /*-----------------------------------------------------*\
     | Zero out buffer                                       |
@@ -394,13 +398,13 @@ void AlienwareAW510KController::SendMode
     /*-----------------------------------------------------*\
     | Send packet                                           |
     \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);
 }
 
 void AlienwareAW510KController::SetMorphMode
     (
     unsigned char   mode,
-    unsigned short  speed,
+    unsigned char   speed,
     unsigned char   red1,
     unsigned char   green1,
     unsigned char   blue1,
@@ -409,7 +413,7 @@ void AlienwareAW510KController::SetMorphMode
     unsigned char   blue2
     )
 {
-    char usb_buf[65];
+    unsigned char usb_buf[65];
 
     /*-----------------------------------------------------*\
     | Zero out buffer                                       |
@@ -438,5 +442,5 @@ void AlienwareAW510KController::SetMorphMode
     /*-----------------------------------------------------*\
     | Send packet                                           |
     \*-----------------------------------------------------*/
-    hid_write(dev, (unsigned char *)usb_buf, 65);
+    hid_write(dev, usb_buf, 65);
 }

Controllers/AlienwareKeyboardController/AlienwareAW510KController/AlienwareAW510KController.h

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

Controllers/AlienwareKeyboardController/AlienwareAW510KController/RGBController_AlienwareAW510K.cpp

@@ -1,15 +1,17 @@
-/*-----------------------------------------*\
-|  RGBController_AlienwareAW510K.cpp        |
-|                                           |
-|  Generic RGB Interface for alienware      |
-|  AW510K Keyboard                          |
-|                                           |
-|  Mohamad Sallal - msallal      05/22/2021 |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_AlienwareAW510K.cpp                         |
+|                                                           |
+|   RGBController for Alienware AW510K keyboard             |
+|                                                           |
+|   Mohamad Sallal (msallal)                    22 May 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
+#include <iterator>
 #include "RGBControllerKeyNames.h"
 #include "RGBController_AlienwareAW510K.h"
-#include <iterator>
 
 //0xFFFFFFFF indicates an unused entry in matrix
 #define NA  0xFFFFFFFF

Controllers/AlienwareKeyboardController/AlienwareAW510KController/RGBController_AlienwareAW510K.h

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

Controllers/AlienwareKeyboardController/AlienwareKeyboardControllerDetect.cpp

@@ -1,21 +1,29 @@
+/*---------------------------------------------------------*\
+| AlienwareKeyboardControllerDetect.cpp                     |
+|                                                           |
+|   Detector for Alienware Keyboard                         |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include <hidapi.h>
 #include "Detector.h"
 #include "AlienwareAW510KController.h"
 #include "AlienwareAW410KController.h"
-#include "RGBController.h"
 #include "RGBController_AlienwareAW510K.h"
 #include "RGBController_AlienwareAW410K.h"
-#include <hidapi/hidapi.h>
 
 /*-----------------------------------------------------*\
 | Alienware vendor ID                                   |
 \*-----------------------------------------------------*/
-#define ALIENWARE_VID           0x04F2
+#define ALIENWARE_VID                           0x04F2
 
 /*-----------------------------------------------------*\
 | Keyboard product IDs                                  |
 \*-----------------------------------------------------*/
-#define ALIENWARE_AW510K_PID    0x1830
-#define ALIENWARE_AW410K_PID    0x1968
+#define ALIENWARE_AW510K_PID                    0x1830
+#define ALIENWARE_AW410K_PID                    0x1968
 
 /******************************************************************************************\
 *                                                                                          *

Controllers/AlienwareKeyboardController/RGBController_AlienwareAW410K.h

@@ -1,36 +0,0 @@
-/*------------------------------------------------------*\
-|  RGBController_AlienwareAW410K.h                       |
-|                                                        |
-|  Generic RGB Interface for Alienware                   |
-|  AW410K keyboard                                       |
-|                                                        |
-|  based on AW510K controller by Mohamad Sallal - msallal|
-|                                                        |
-|  Dominik Mikolajczyk - dmiko 23/10/2023                |
-\*------------------------------------------------------*/
-
-#pragma once
-
-#include "RGBController.h"
-#include "AlienwareAW410KController.h"
-
-class RGBController_AlienwareAW410K : public RGBController
-{
-public:
-    RGBController_AlienwareAW410K(AlienwareAW410KController* controller_ptr);
-    ~RGBController_AlienwareAW410K();
-
-    void        SetupZones();
-
-    void        ResizeZone(int zone, int new_size);
-
-    void        DeviceUpdateLEDs();
-    void        UpdateZoneLEDs(int zone);
-    void        UpdateSingleLED(int led);
-
-    void        DeviceUpdateMode();
-
-private:
-    AlienwareAW410KController*  controller;
-    std::vector<RGBColor>       current_colors;
-};

Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.h

@@ -1,34 +0,0 @@
-/*-----------------------------------------*\
-|  RGBController_AlienwareAW510K.h          |
-|                                           |
-|  Generic RGB Interface for Alienware      |
-|  AW510K keyboard                          |
-|                                           |
-|  Mohamad Sallal - msallal      05/22/2021 |
-\*-----------------------------------------*/
-
-#pragma once
-
-#include "RGBController.h"
-#include "AlienwareAW510KController.h"
-
-class RGBController_AlienwareAW510K : public RGBController
-{
-public:
-    RGBController_AlienwareAW510K(AlienwareAW510KController* controller_ptr);
-    ~RGBController_AlienwareAW510K();
-
-    void        SetupZones();
-
-    void        ResizeZone(int zone, int new_size);
-    
-    void        DeviceUpdateLEDs();
-    void        UpdateZoneLEDs(int zone);
-    void        UpdateSingleLED(int led);
-
-    void        DeviceUpdateMode();
-
-private:
-    AlienwareAW510KController*  controller;
-    std::vector<RGBColor>       current_colors;
-};

Controllers/AlienwareMonitorController/AlienwareAW3423DWFController.cpp

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

Controllers/AlienwareMonitorController/AlienwareAW3423DWFController.h

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

Controllers/AlienwareMonitorController/AlienwareMonitorController.cpp

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

Controllers/AlienwareMonitorController/AlienwareMonitorController.h

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

Controllers/AlienwareMonitorController/AlienwareMonitorControllerDetect.cpp

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

Controllers/AlienwareMonitorController/RGBController_AlienwareAW3423DWF.cpp

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

Controllers/AlienwareMonitorController/RGBController_AlienwareAW3423DWF.h

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

Controllers/AlienwareMonitorController/RGBController_AlienwareMonitor.cpp

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

Controllers/AlienwareMonitorController/RGBController_AlienwareMonitor.h

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

Controllers/AnnePro2Controller/AnnePro2Controller.cpp

@@ -1,32 +1,36 @@
-/*-----------------------------------------*\
-|  AnnePro2Controller.cpp                   |
-|                                           |
-|  Driver for Obins Lab AnnePro2 keyboard   |
-|                                           |
-|  Sergey Gavrilov (DrZlo13) 06/06/2021     |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| AnnePro2Controller.cpp                                    |
+|                                                           |
+|   Driver for Obins Lab AnnePro2 keyboard                  |
+|                                                           |
+|   Sergey Gavrilov (DrZlo13)                   06 Jun 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "AnnePro2Controller.h"
+#include "StringUtils.h"
 
 using namespace std::chrono_literals;
 
-AnnePro2Controller::AnnePro2Controller(hid_device* dev_handle, const char* path) 
+AnnePro2Controller::AnnePro2Controller(hid_device* dev_handle, const char* path)
 {
     dev         = dev_handle;
     location    = path;
 }
 
-AnnePro2Controller::~AnnePro2Controller() 
+AnnePro2Controller::~AnnePro2Controller()
 {
     hid_close(dev);
 }
 
-std::string AnnePro2Controller::GetDeviceLocation() 
+std::string AnnePro2Controller::GetDeviceLocation()
 {
     return("HID: " + location);
 }
 
-std::string AnnePro2Controller::GetSerialString() 
+std::string AnnePro2Controller::GetSerialString()
 {
     wchar_t serial_string[128];
     int ret = hid_get_serial_number_string(dev, serial_string, 128);
@@ -36,13 +40,10 @@ std::string AnnePro2Controller::GetSerialString()
         return("");
     }
 
-    std::wstring return_wstring = serial_string;
-    std::string return_string(return_wstring.begin(), return_wstring.end());
-
-    return(return_string);
+    return(StringUtils::wstring_to_string(serial_string));
 }
 
-void AnnePro2Controller::SendDirect(unsigned char frame_count, unsigned char * frame_data) 
+void AnnePro2Controller::SendDirect(unsigned char frame_count, unsigned char * frame_data)
 {
     /*-------------------------------------------------------------*\
     | Reverse engineered by https://github.com/manualmanul/Annemone |
@@ -74,7 +75,7 @@ void AnnePro2Controller::SendDirect(unsigned char frame_count, unsigned char * f
     {
         const unsigned char e = (messages_to_send_amount << 4) + p;
         const unsigned char a = ((messages_to_send_amount - 1) == p) ? val_2 + real_command_info_length : max_message_length + real_command_info_length;
-        
+
         /*---------------------------------------------------------*\
         | Service data                                              |
         \*---------------------------------------------------------*/

Controllers/AnnePro2Controller/AnnePro2Controller.h

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

Controllers/AnnePro2Controller/AnnePro2ControllerDetect.cpp

@@ -1,16 +1,33 @@
+/*---------------------------------------------------------*\
+| AnnePro2ControllerDetect.cpp                              |
+|                                                           |
+|   Detector for Obins Lab AnnePro2 keyboard                |
+|                                                           |
+|   Sergey Gavrilov (DrZlo13)                   06 Jun 2021 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #include "Detector.h"
 #include "AnnePro2Controller.h"
-#include "RGBController.h"
 #include "RGBController_AnnePro2.h"
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 
-#define ANNE_PRO_2_VID_1 0x04D9
-#define ANNE_PRO_2_VID_2 0x3311
-#define ANNE_PRO_2_PID_1 0x8008
-#define ANNE_PRO_2_PID_2 0x8009
-#define ANNE_PRO_2_PID_3 0xA292
-#define ANNE_PRO_2_PID_4 0xA293
-#define ANNE_PRO_2_PID_5 0xA297
+/*---------------------------------------------------------*\
+| Anne Pro 2 vendor IDs                                     |
+\*---------------------------------------------------------*/
+#define ANNE_PRO_2_VID_1                            0x04D9
+#define ANNE_PRO_2_VID_2                            0x3311
+
+/*---------------------------------------------------------*\
+| Anne Pro 2 product IDs                                    |
+\*---------------------------------------------------------*/
+#define ANNE_PRO_2_PID_1                            0x8008
+#define ANNE_PRO_2_PID_2                            0x8009
+#define ANNE_PRO_2_PID_3                            0xA292
+#define ANNE_PRO_2_PID_4                            0xA293
+#define ANNE_PRO_2_PID_5                            0xA297
 
 /******************************************************************************************\
 *                                                                                          *

Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp

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

Controllers/AnnePro2Controller/RGBController_AnnePro2.h

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

Controllers/ArcticController/ArcticController.cpp

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