Add Translations field to SDK protocol

.gitlab-ci.yml

@@ -7,22 +7,6 @@
 #-----------------------------------------------------------------------#
 # OpenRGB GitLab CI Configuration                                       #
 #-----------------------------------------------------------------------#
-.fork_local_runner_rules:
-  rules:
-  - if: $CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB" || $CI_PIPELINE_SOURCE == "push"
-    when: on_success
-
-.fork_gitlab_runner_rules:
-  rules:
-  - if: $CI_PROJECT_PATH != "CalcProgrammer1/OpenRGB" && $CI_PIPELINE_SOURCE == "push"
-    when: manual
-    allow_failure: true
-
-.upstream_rules:
-  rules:
-  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
-    when: on_success
-  - !reference [.fork_gitlab_runner_rules, rules]
 
 .shared_windows_runners:
   tags:
@@ -48,10 +32,7 @@ before_script:
 #-----------------------------------------------------------------------#
 "Supported Devices":
   <<: *ccache_init
-  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-amd64
-  tags:
-  - linux
-  - amd64
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bullseye-64
   stage: build
   script:
   - qmake
@@ -61,28 +42,33 @@ before_script:
   artifacts:
     name: "${CI_PROJECT_NAME}_Supported_Devices_${CI_COMMIT_SHORT_SHA}"
     paths:
+    - ./*.md
     - Supported Devices.csv
+    exclude:
+    - README.md
+    - CONTRIBUTING.md
     expire_in: 30 days
 
   rules:
-    - !reference [.upstream_rules, rules]
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
 
 #-----------------------------------------------------------------------#
-# Linux (AppImage) i386 Build Target                                    #
+# Linux (AppImage) 32-bit Build Target                                  #
 #-----------------------------------------------------------------------#
-"Linux i386 AppImage":
+"Linux 32 AppImage":
   <<: *ccache_init
-  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-i386
-  tags:
-  - linux
-  - i386
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-32
   stage: build
   script:
   - export $(dpkg-architecture)
   - ./scripts/build-appimage.sh
 
   artifacts:
-    name: "${CI_PROJECT_NAME}_Linux_i386_${CI_COMMIT_SHORT_SHA}"
+    name: "${CI_PROJECT_NAME}_Linux_32_${CI_COMMIT_SHORT_SHA}"
     paths:
     - OpenRGB-i386.AppImage
     - 60-openrgb.rules
@@ -90,105 +76,182 @@ before_script:
     expire_in: 30 days
 
   rules:
-    - !reference [.upstream_rules, rules]
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
 
 #-----------------------------------------------------------------------#
-# Linux (AppImage) amd64 Build Target                                   #
+# Linux (AppImage) 64-bit Build Target                                  #
 #-----------------------------------------------------------------------#
-"Linux amd64 AppImage Base":
+"Linux 64 AppImage":
   <<: *ccache_init
-  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-amd64
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-64
   stage: build
   script:
   - export $(dpkg-architecture)
   - ./scripts/build-appimage.sh
 
   artifacts:
-    name: "${CI_PROJECT_NAME}_Linux_amd64_${CI_COMMIT_SHORT_SHA}"
+    name: "${CI_PROJECT_NAME}_Linux_64_${CI_COMMIT_SHORT_SHA}"
     paths:
     - OpenRGB-x86_64.AppImage
     - 60-openrgb.rules
     - README.md
     expire_in: 30 days
 
-  rules:
-  - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "push"
-    when: never
-
-"Linux amd64 AppImage":
-  extends: "Linux amd64 AppImage Base"
-  rules:
-  - !reference [.fork_local_runner_rules, rules]
-  tags:
-  - linux
-  - amd64
-
-"Linux amd64 AppImage (gitlab.com runner)":
-  extends: "Linux amd64 AppImage Base"
-  rules:
-  - !reference [.fork_gitlab_runner_rules, rules]
-  tags:
-  - "saas-linux-small-amd64"
-
 #-----------------------------------------------------------------------#
-# Linux (AppImage) armhf Build Target                                   #
+# Linux (.deb) Debian Buster (Legacy) 32-bit Build Target               #
 #-----------------------------------------------------------------------#
-"Linux armhf AppImage":
+"Linux 32 .deb (Debian Buster)":
   <<: *ccache_init
-  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-armhf
-  tags:
-  - linux
-  - armhf
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:buster-32
   stage: build
   script:
-  - export $(dpkg-architecture)
-  - ./scripts/build-appimage.sh
+  - ./scripts/build-package-files.sh debian/changelog
+  - dpkg-architecture -l
+  - dpkg-buildpackage --target-arch i386 -us -B
+  - rm -v ../openrgb-dbgsym*.*deb
+  - mv -v ../openrgb*.deb ./
 
   artifacts:
-    name: "${CI_PROJECT_NAME}_Linux_armhf_${CI_COMMIT_SHORT_SHA}"
+    name: "${CI_PROJECT_NAME}_Linux_32_deb_${CI_COMMIT_SHORT_SHA}"
     paths:
-    - OpenRGB-armhf.AppImage
-    - 60-openrgb.rules
-    - README.md
+    - openrgb*.deb
+    exclude:
+    - openrgb-dbgsym*.*deb
     expire_in: 30 days
 
   rules:
-    - !reference [.upstream_rules, rules]
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
 
 #-----------------------------------------------------------------------#
-# Linux (AppImage) arm64 Build Target                                   #
+# Linux (.deb) Debian Buster (Legacy) 64-bit Build Target               #
 #-----------------------------------------------------------------------#
-"Linux arm64 AppImage":
+"Linux 64 .deb (Debian Buster)":
   <<: *ccache_init
-  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-arm64
-  tags:
-  - linux
-  - arm64
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:buster-64
   stage: build
   script:
-  - export $(dpkg-architecture)
-  - ./scripts/build-appimage.sh
+  - ./scripts/build-package-files.sh debian/changelog
+  - dpkg-architecture -l
+  - dpkg-buildpackage -us -B
+  - rm -v ../openrgb-dbgsym*.*deb
+  - mv -v ../openrgb*.deb ./
 
   artifacts:
-    name: "${CI_PROJECT_NAME}_Linux_arm64_${CI_COMMIT_SHORT_SHA}"
+    name: "${CI_PROJECT_NAME}_Linux_64_deb_${CI_COMMIT_SHORT_SHA}"
     paths:
-    - OpenRGB-arm64.AppImage
-    - 60-openrgb.rules
-    - README.md
+    - openrgb*.deb
+    exclude:
+    - openrgb-dbgsym*.*deb
     expire_in: 30 days
 
   rules:
-    - !reference [.upstream_rules, rules]
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
 
 #-----------------------------------------------------------------------#
-# Linux (.deb) Debian Bookworm i386 Build Target                        #
+# Linux (.deb) Debian Bullseye 32-bit Build Target                      #
 #-----------------------------------------------------------------------#
-"Linux i386 .deb (Debian Bookworm)":
+"Linux 32 .deb (Debian Bullseye)":
   <<: *ccache_init
-  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-i386
-  tags:
-  - linux
-  - i386
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bullseye-32
+  stage: build
+  script:
+  - ./scripts/build-package-files.sh debian/changelog
+  - dpkg-architecture -l
+  - dpkg-buildpackage --target-arch i386 -us -B
+  - rm -v ../openrgb-dbgsym*.*deb
+  - mv -v ../openrgb*.deb ./
+
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_32_deb_${CI_COMMIT_SHORT_SHA}"
+    paths:
+    - openrgb*.deb
+    exclude:
+    - openrgb-dbgsym*.*deb
+    expire_in: 30 days
+
+  rules:
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
+
+#-----------------------------------------------------------------------#
+# Linux (.deb) Debian Bullseye 64-bit Build Target                      #
+#-----------------------------------------------------------------------#
+"Linux 64 .deb (Debian Bullseye)":
+  <<: *ccache_init
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bullseye-64
+  stage: build
+  script:
+  - ./scripts/build-package-files.sh debian/changelog
+  - dpkg-architecture -l
+  - dpkg-buildpackage -us -B
+  - rm -v ../openrgb-dbgsym*.*deb
+  - mv -v ../openrgb*.deb ./
+
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_64_deb_${CI_COMMIT_SHORT_SHA}"
+    paths:
+    - openrgb*.deb
+    exclude:
+    - openrgb-dbgsym*.*deb
+    expire_in: 30 days
+
+  rules:
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
+
+#-----------------------------------------------------------------------#
+# Linux (.deb) Debian Bookworm 32-bit Build Target                      #
+#-----------------------------------------------------------------------#
+"Linux 32 .deb (Debian Bookworm)":
+  <<: *ccache_init
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-32
+  stage: build
+  script:
+  - ./scripts/build-package-files.sh debian/changelog
+  - dpkg-architecture -l
+  - dpkg-buildpackage --target-arch i386 -us -B
+  - rm -v ../openrgb-dbgsym*.deb
+  - mv -v ../openrgb*.deb ./
+
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_32_deb_${CI_COMMIT_SHORT_SHA}"
+    paths:
+    - openrgb*.deb
+    exclude:
+    - openrgb-dbgsym*.deb
+    expire_in: 30 days
+
+  rules:
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
+
+#-----------------------------------------------------------------------#
+# Linux (.deb) Debian Bookworm 64-bit Build Target                      #
+#-----------------------------------------------------------------------#
+"Linux 64 .deb (Debian Bookworm)":
+  <<: *ccache_init
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-64
   stage: build
   script:
   - ./scripts/build-package-files.sh debian/changelog
@@ -198,7 +261,7 @@ before_script:
   - mv -v ../openrgb*.deb ./
 
   artifacts:
-    name: "${CI_PROJECT_NAME}_Linux_i386_deb_${CI_COMMIT_SHORT_SHA}"
+    name: "${CI_PROJECT_NAME}_Linux_64_deb_${CI_COMMIT_SHORT_SHA}"
     paths:
     - openrgb*.deb
     exclude:
@@ -206,97 +269,52 @@ before_script:
     expire_in: 30 days
 
   rules:
-    - !reference [.upstream_rules, rules]
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
 
 #-----------------------------------------------------------------------#
-# Linux (.deb) Debian Bookworm amd64 Build Target                       #
+# Linux (.rpm, f35) 64-bit Build Target                                 #
 #-----------------------------------------------------------------------#
-"Linux amd64 .deb (Debian Bookworm)":
-  <<: *ccache_init
-  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-amd64
-  tags:
-  - linux
-  - amd64
+"Linux 64 f35 rpm":
+  image: fedora:35
   stage: build
   script:
-  - ./scripts/build-package-files.sh debian/changelog
-  - dpkg-architecture -l
-  - dpkg-buildpackage -us -B
-  - rm -v ../openrgb-dbgsym*.deb
-  - mv -v ../openrgb*.deb ./
+  - dnf install rpmdevtools dnf-plugins-core -y
+  - rpmdev-setuptree
+  - ./scripts/build-package-files.sh fedora/OpenRGB.spec
+  - ls /root/
+  - cp fedora/OpenRGB.spec /root/rpmbuild/SPECS
+  - cp ../OpenRGB /root/rpmbuild/SOURCES/ -r
+  - cd /root/rpmbuild/SOURCES
+  - tar -cf OpenRGB.tar.gz OpenRGB/
+  - cd ..
+  - dnf builddep SPECS/OpenRGB.spec -y
+  - rpmbuild -ba SPECS/OpenRGB.spec
+  - cd RPMS/x86_64/
+  - mv openrgb*.rpm ${CI_PROJECT_DIR}/
+  - cd ${CI_PROJECT_DIR}
 
   artifacts:
-    name: "${CI_PROJECT_NAME}_Linux_amd64_deb_${CI_COMMIT_SHORT_SHA}"
+    name: "${CI_PROJECT_NAME}_Linux_64_rpm_${CI_COMMIT_SHORT_SHA}"
     paths:
-    - openrgb*.deb
-    exclude:
-    - openrgb-dbgsym*.deb
+    - openrgb*.rpm
     expire_in: 30 days
 
   rules:
-    - !reference [.upstream_rules, rules]
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
 
 #-----------------------------------------------------------------------#
-# Linux (.deb) Debian Bookworm armhf Build Target                       #
+# Linux (.rpm, f36) 64-bit Build Target                                 #
 #-----------------------------------------------------------------------#
-"Linux armhf .deb (Debian Bookworm)":
-  <<: *ccache_init
-  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-armhf
-  tags:
-  - linux
-  - armhf
-  stage: build
-  script:
-  - ./scripts/build-package-files.sh debian/changelog
-  - dpkg-architecture -l
-  - dpkg-buildpackage -us -B
-  - rm -v ../openrgb-dbgsym*.deb
-  - mv -v ../openrgb*.deb ./
-
-  artifacts:
-    name: "${CI_PROJECT_NAME}_Linux_armhf_deb_${CI_COMMIT_SHORT_SHA}"
-    paths:
-    - openrgb*.deb
-    exclude:
-    - openrgb-dbgsym*.deb
-    expire_in: 30 days
-
-  rules:
-    - !reference [.upstream_rules, rules]
-
-#-----------------------------------------------------------------------#
-# Linux (.deb) Debian Bookworm arm64 Build Target                       #
-#-----------------------------------------------------------------------#
-"Linux arm64 .deb (Debian Bookworm)":
-  <<: *ccache_init
-  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-arm64
-  tags:
-  - linux
-  - arm64
-  stage: build
-  script:
-  - ./scripts/build-package-files.sh debian/changelog
-  - dpkg-architecture -l
-  - dpkg-buildpackage -us -B
-  - rm -v ../openrgb-dbgsym*.deb
-  - mv -v ../openrgb*.deb ./
-
-  artifacts:
-    name: "${CI_PROJECT_NAME}_Linux_arm64_deb_${CI_COMMIT_SHORT_SHA}"
-    paths:
-    - openrgb*.deb
-    exclude:
-    - openrgb-dbgsym*.deb
-    expire_in: 30 days
-
-  rules:
-    - !reference [.upstream_rules, rules]
-
-#-----------------------------------------------------------------------#
-# Linux (.rpm, F40) 64-bit Build Target                                 #
-#-----------------------------------------------------------------------#
-"Linux 64 F40 rpm":
-  image: fedora:40
+"Linux 64 f36 rpm":
+  image: fedora:36
   stage: build
   script:
   - dnf install rpmdevtools dnf-plugins-core libcurl-devel qt5-qtbase-devel -y
@@ -321,12 +339,80 @@ before_script:
     expire_in: 30 days
 
   rules:
-    - !reference [.upstream_rules, rules]
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
 
 #-----------------------------------------------------------------------#
-# Debian i386 Bookworm test                                             #
+# Debian 32 Buster test                                                 #
 #-----------------------------------------------------------------------#
-"Debian i386 Bookworm":
+"Debian 32 Buster":
+  image: i386/debian:buster
+  stage: test
+  script:
+  - apt update
+  - DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*i386.deb
+  - openrgb --version
+  - apt remove -y openrgb
+  dependencies:
+  - "Linux 32 .deb (Debian Buster)"
+  needs:
+  - "Linux 32 .deb (Debian Buster)"
+
+#-----------------------------------------------------------------------#
+# Debian 64 Buster test                                                 #
+#-----------------------------------------------------------------------#
+"Debian 64 Buster":
+  image: amd64/debian:buster
+  stage: test
+  script:
+  - apt update
+  - DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*amd64.deb
+  - openrgb --version
+  - apt remove -y openrgb
+  dependencies:
+  - "Linux 64 .deb (Debian Buster)"
+  needs:
+  - "Linux 64 .deb (Debian Buster)"
+
+#-----------------------------------------------------------------------#
+# Debian 32 Bullseye test                                               #
+#-----------------------------------------------------------------------#
+"Debian 32 Bullseye":
+  image: i386/debian:bullseye
+  stage: test
+  script:
+  - apt update
+  - DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*i386.deb
+  - openrgb --version
+  - apt remove -y openrgb
+  dependencies:
+  - "Linux 32 .deb (Debian Bullseye)"
+  needs:
+  - "Linux 32 .deb (Debian Bullseye)"
+
+#-----------------------------------------------------------------------#
+# Debian 64 Bullseye test                                               #
+#-----------------------------------------------------------------------#
+"Debian 64 Bullseye":
+  image: amd64/debian:bullseye
+  stage: test
+  script:
+  - apt update
+  - DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*amd64.deb
+  - openrgb --version
+  - apt remove -y openrgb
+  dependencies:
+  - "Linux 64 .deb (Debian Bullseye)"
+  needs:
+  - "Linux 64 .deb (Debian Bullseye)"
+
+#-----------------------------------------------------------------------#
+# Debian 32 Bookworm test                                               #
+#-----------------------------------------------------------------------#
+"Debian 32 Bookworm":
   image: i386/debian:bookworm
   stage: test
   script:
@@ -335,14 +421,14 @@ before_script:
   - openrgb --version
   - apt remove -y openrgb
   dependencies:
-  - "Linux i386 .deb (Debian Bookworm)"
+  - "Linux 32 .deb (Debian Bookworm)"
   needs:
-  - "Linux i386 .deb (Debian Bookworm)"
+  - "Linux 32 .deb (Debian Bookworm)"
 
 #-----------------------------------------------------------------------#
-# Debian amd64 Bookworm test                                            #
+# Debian 64 Bookworm test                                               #
 #-----------------------------------------------------------------------#
-"Debian amd64 Bookworm":
+"Debian 64 Bookworm":
   image: amd64/debian:bookworm
   stage: test
   script:
@@ -351,14 +437,30 @@ before_script:
   - openrgb --version
   - apt remove -y openrgb
   dependencies:
-  - "Linux amd64 .deb (Debian Bookworm)"
+  - "Linux 64 .deb (Debian Bookworm)"
   needs:
-  - "Linux amd64 .deb (Debian Bookworm)"
+  - "Linux 64 .deb (Debian Bookworm)"
 
 #-----------------------------------------------------------------------#
-# Ubuntu amd64 22.04 test                                               #
+# Ubuntu 64 20.04LTS test                                               #
 #-----------------------------------------------------------------------#
-"Ubuntu amd64 22.04LTS":
+"Ubuntu 64 20.04LTS":
+  image: ubuntu:focal
+  stage: test
+  script:
+  - apt update
+  - DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*amd64.deb
+  - openrgb --version
+  - apt remove -y openrgb
+  dependencies:
+  - "Linux 64 .deb (Debian Buster)"
+  needs:
+  - "Linux 64 .deb (Debian Buster)"
+
+#-----------------------------------------------------------------------#
+# Ubuntu 64 22.04 test                                                  #
+#-----------------------------------------------------------------------#
+"Ubuntu 64 22.04LTS":
   image: ubuntu:jammy
   stage: test
   script:
@@ -367,40 +469,39 @@ before_script:
   - openrgb --version
   - apt remove -y openrgb
   dependencies:
-  - "Linux amd64 .deb (Debian Bookworm)"
+  - "Linux 64 .deb (Debian Bookworm)"
   needs:
-  - "Linux amd64 .deb (Debian Bookworm)"
+  - "Linux 64 .deb (Debian Bookworm)"
 
 #-----------------------------------------------------------------------#
-# Ubuntu amd64 24.04 test                                               #
+# Fedora 64 v35 test                                                    #
 #-----------------------------------------------------------------------#
-"Ubuntu amd64 24.04LTS":
-  image: ubuntu:noble
-  stage: test
-  script:
-  - apt update
-  - DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*amd64.deb
-  - openrgb --version
-  - apt remove -y openrgb
-  dependencies:
-  - "Linux amd64 .deb (Debian Bookworm)"
-  needs:
-  - "Linux amd64 .deb (Debian Bookworm)"
-
-#-----------------------------------------------------------------------#
-# Fedora 64 v40 test                                                    #
-#-----------------------------------------------------------------------#
-"Fedora 64 v40":
-  image: fedora:40
+"Fedora 64 v35":
+  image: fedora:35
   stage: test
   script:
   - yum -y localinstall ./openrgb*64.rpm
   - openrgb --version
   - yum -y remove openrgb
   dependencies:
-  - "Linux 64 F40 rpm"
+  - "Linux 64 f35 rpm"
   needs:
-  - "Linux 64 F40 rpm"
+  - "Linux 64 f35 rpm"
+
+#-----------------------------------------------------------------------#
+# Fedora 64 v36 test                                                    #
+#-----------------------------------------------------------------------#
+"Fedora 64 v36":
+  image: fedora:36
+  stage: test
+  script:
+  - yum -y localinstall ./openrgb*64.rpm
+  - openrgb --version
+  - yum -y remove openrgb
+  dependencies:
+  - "Linux 64 f36 rpm"
+  needs:
+  - "Linux 64 f36 rpm"
 
 #-----------------------------------------------------------------------#
 # Windows (32-bit) Build Target                                         #
@@ -474,12 +575,16 @@ before_script:
     expire_in: 30 days
 
   rules:
-    - !reference [.upstream_rules, rules]
+  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
+    when: on_success
+  - if: $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
 
 #-----------------------------------------------------------------------#
 # Windows (64-bit) Build Target                                         #
 #-----------------------------------------------------------------------#
-"Windows 64 Base":
+"Windows 64":
   extends:
   - .shared_windows_runners
   stage: build
@@ -547,25 +652,6 @@ before_script:
     - 'OpenRGB Windows 64-bit\*.qm'
     expire_in: 30 days
 
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "push"
-      when: never
-
-
-"Windows 64":
-  extends: "Windows 64 Base"
-  rules:
-  - !reference [.fork_local_runner_rules, rules]
-
-"Windows 64 (gitlab.com runner)":
-  extends: "Windows 64 Base"
-  before_script:
-    choco install visualstudio2019-workload-vctools -y # gitlab provides vs2022, so add vs2019
-  rules:
-  - !reference [.fork_gitlab_runner_rules, rules]
-  tags:
-  - "saas-windows-medium-amd64"
-
 #-----------------------------------------------------------------------#
 # MacOS Build Target                                                    #
 #-----------------------------------------------------------------------#

.gitlab/CODEOWNERS

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

AutoStart/AutoStart-FreeBSD.cpp

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

AutoStart/AutoStart-FreeBSD.h

@@ -1,12 +1,3 @@
-/*---------------------------------------------------------*\
-| 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,20 +1,17 @@
-/*---------------------------------------------------------*\
-| AutoStart-Linux.cpp                                       |
-|                                                           |
-|   Autostart implementation for Linux                      |
-|                                                           |
-|   This file is part of the OpenRGB project                |
-|   SPDX-License-Identifier: GPL-2.0-only                   |
-\*---------------------------------------------------------*/
+#include "AutoStart-Linux.h"
+#include "LogManager.h"
+#include "filesystem.h"
 
 #include <fstream>
 #include <iostream>
 #include <sstream>
 #include <unistd.h>
 #include <linux/limits.h>
-#include "AutoStart-Linux.h"
-#include "LogManager.h"
-#include "filesystem.h"
+
+/*-----------------------------------------------------*\
+| Linux AutoStart Implementation                        |
+| Public Methods                                        |
+\*-----------------------------------------------------*/
 
 AutoStart::AutoStart(std::string name)
 {
@@ -53,7 +50,7 @@ bool AutoStart::DisableAutoStart()
     }
     else
     {
-        LOG_ERROR("[AutoStart] Could not establish correct autostart file path.");
+        LOG_ERROR("Could not establish correct autostart file path.");
     }
 
     return(success);
@@ -76,7 +73,7 @@ bool AutoStart::EnableAutoStart(AutoStartInfo autostart_info)
         \*---------------------------------------------*/
         if(!autostart_file_stream)
         {
-            LOG_ERROR("[AutoStart] Could not open %s for writing.", autostart_file.c_str());
+            LOG_ERROR("Could not open %s for writing.", autostart_file.c_str());
             success = false;
         }
         /*---------------------------------------------*\
@@ -90,13 +87,13 @@ bool AutoStart::EnableAutoStart(AutoStartInfo autostart_info)
 
             if (!success)
             {
-                LOG_ERROR("[AutoStart] An error occurred writing the auto start file.");
+                LOG_ERROR("An error occurred writing the auto start file.");
             }
         }
     }
     else
     {
-        LOG_ERROR("[AutoStart] Could not establish correct autostart file path.");
+        LOG_ERROR("Could not establish correct autostart file path.");
     }
 
     return(success);
@@ -125,7 +122,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));
 }
 
@@ -162,7 +159,7 @@ std::string AutoStart::GenerateDesktopFile(AutoStartInfo autostart_info)
     }
 
     fileContents << std::endl;
-
+    
     return(fileContents.str());
 }
 
@@ -201,7 +198,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,12 +1,3 @@
-/*---------------------------------------------------------*\
-| 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,20 +1,18 @@
-/*---------------------------------------------------------*\
-| AutoStart-MacOS.cpp                                       |
-|                                                           |
-|   Autostart implementation for MacOS                      |
-|                                                           |
-|   This file is part of the OpenRGB project                |
-|   SPDX-License-Identifier: GPL-2.0-only                   |
-\*---------------------------------------------------------*/
+#include "AutoStart-MacOS.h"
+#include "LogManager.h"
+#include "filesystem.h"
 
 #include <fstream>
 #include <sstream>
 #include <iostream>
 #include <unistd.h>
+
 #include <mach-o/dyld.h>
-#include "AutoStart-MacOS.h"
-#include "LogManager.h"
-#include "filesystem.h"
+
+/*-----------------------------------------------------*\
+| MacOS AutoStart Implementation                        |
+| Public Methods                                        |
+\*-----------------------------------------------------*/
 
 AutoStart::AutoStart(std::string name)
 {
@@ -53,7 +51,7 @@ bool AutoStart::DisableAutoStart()
     }
     else
     {
-        LOG_ERROR("[AutoStart] Could not establish correct autostart file path.");
+        LOG_ERROR("Could not establish correct autostart file path.");
     }
 
     return(success);
@@ -76,7 +74,7 @@ bool AutoStart::EnableAutoStart(AutoStartInfo autostart_info)
         \*---------------------------------------------*/
         if(!autostart_file_stream)
         {
-            LOG_ERROR("[AutoStart] Could not open %s for writing.", autostart_file.c_str());
+            LOG_ERROR("Could not open %s for writing.", autostart_file.c_str());
             success = false;
         }
         /*---------------------------------------------*\
@@ -90,13 +88,13 @@ bool AutoStart::EnableAutoStart(AutoStartInfo autostart_info)
 
             if (!success)
             {
-                LOG_ERROR("[AutoStart] An error occurred writing the auto start file.");
+                LOG_ERROR("An error occurred writing the auto start file.");
             }
         }
     }
     else
     {
-        LOG_ERROR("[AutoStart] Could not establish correct autostart file path.");
+        LOG_ERROR("Could not establish correct autostart file path.");
     }
 
     return(success);
@@ -154,7 +152,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);
@@ -165,12 +163,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());
 }
 
@@ -195,7 +193,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,12 +1,3 @@
-/*---------------------------------------------------------*\
-| 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,19 +1,17 @@
-/*---------------------------------------------------------*\
-| 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 <shlobj.h>
 #include "AutoStart-Windows.h"
 #include "LogManager.h"
 #include "filesystem.h"
+
+#include <fstream>
+#include <iostream>
+
 #include "windows.h"
+#include <shlobj.h>
+
+/*-----------------------------------------------------*\
+| Windows AutoStart Implementation                      |
+| Public Methods                                        |
+\*-----------------------------------------------------*/
 
 AutoStart::AutoStart(std::string name)
 {
@@ -43,16 +41,16 @@ bool AutoStart::DisableAutoStart()
         else
         {
             success = filesystem::remove(autostart_file, autostart_file_remove_errcode);
-
+            
             if(!success)
             {
-                LOG_ERROR("[AutoStart] An error occurred removing the auto start file.");
+                LOG_ERROR("An error occurred removing the auto start file.");
             }
         }
     }
     else
     {
-        LOG_ERROR("[AutoStart] Could not establish correct autostart file path.");
+        LOG_ERROR("Could not establish correct autostart file path.");
     }
 
     return(success);
@@ -99,11 +97,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);
@@ -124,7 +122,7 @@ bool AutoStart::EnableAutoStart(AutoStartInfo autostart_info)
     }
     else
     {
-        LOG_ERROR("[AutoStart] Could not establish correct autostart file path.");
+        LOG_ERROR("Could not establish correct autostart file path.");
     }
 
     return success;
@@ -153,7 +151,7 @@ std::string AutoStart::GetExePath()
     char exepath[MAX_PATH] = "";
 
     DWORD count = GetModuleFileNameA(NULL, exepath, MAX_PATH);
-
+    
     return(std::string(exepath, (count > 0) ? count : 0));
 }
 
@@ -199,8 +197,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,12 +1,3 @@
-/*---------------------------------------------------------*\
-| 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,14 +1,10 @@
-/*---------------------------------------------------------*\
-| AutoStart.cpp                                             |
-|                                                           |
-|   Autostart common implementation                         |
-|                                                           |
-|   This file is part of the OpenRGB project                |
-|   SPDX-License-Identifier: GPL-2.0-only                   |
-\*---------------------------------------------------------*/
-
 #include "AutoStart.h"
 
+/*-----------------------------------------------------*\
+| Common AutoStart Implementation                       |
+| Public Methods                                        |
+\*-----------------------------------------------------*/
+
 std::string AutoStartInterface::GetAutoStartFile()
 {
     return(autostart_file);

AutoStart/AutoStart.h

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

Colors.h

@@ -1,12 +1,3 @@
-/*---------------------------------------------------------*\
-| 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,20 +1,19 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-------------------------------------------------------------------*\
+|  A4TechDetector.cpp                                                 |
+|                                                                     |
+|  Driver for A4Tech Devices Detector                                 |
+|                                                                     |
+|  Chris M (Dr_No)                              30 Jun 2022           |
+|  Mohammed Julfikar Ali Mahbub (o-julfikar)    01 Apr 2024           |
+|                                                                     |
+\*-------------------------------------------------------------------*/
 
 /*-----------------------------------------------------*\
 | OpenRGB includes                                      |
 \*-----------------------------------------------------*/
-#include <hidapi.h>
+#include <hidapi/hidapi.h>
 #include "Detector.h"
+#include "RGBController.h"
 
 /*-----------------------------------------------------*\
 | A4 Tech specific includes                             |
@@ -55,9 +54,7 @@ void DetectBloodyB820R(hid_device_info* info, const std::string& name)
     }
 }
 
-REGISTER_HID_DETECTOR_IPU("Bloody W60 Pro",  DetectA4TechMouseControllers,       A4_TECH_VID,    BLOODY_W60_PRO_PID,     2,      0xFF33,     0x0529);
-REGISTER_HID_DETECTOR_IPU("Bloody W70 Max",  DetectA4TechMouseControllers,       A4_TECH_VID,    BLOODY_W70_MAX_PID,     2,      0xFF33,     0x0518);
-REGISTER_HID_DETECTOR_IPU("Bloody W90 Max",  DetectA4TechMouseControllers,       A4_TECH_VID,    BLOODY_W90_MAX_PID,     2,      0xFF33,     0x053D);
-REGISTER_HID_DETECTOR_IPU("Bloody 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);
+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);

Controllers/A4TechController/BloodyB820RController.cpp

@@ -1,24 +1,21 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-------------------------------------------------------------------*\
+|  BloodyB820RController.cpp                                          |
+|                                                                     |
+|  Driver for A4Tech Bloody B820R Keyboard Controller                 |
+|                                                                     |
+|  Mohammed Julfikar Ali Mahbub (o-julfikar)          01 Apr 2024     |
+|                                                                     |
+\*-------------------------------------------------------------------*/
 
 #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)
 {
@@ -36,15 +33,14 @@ BloodyB820RController::~BloodyB820RController()
 
 std::string BloodyB820RController::GetSerial()
 {
-    wchar_t serial_string[HID_MAX_STR];
-    int ret = hid_get_serial_number_string(dev, serial_string, HID_MAX_STR);
+    const int szTemp    = HID_MAX_STR;
+    wchar_t   tmpName[szTemp];
 
-    if(ret != 0)
-    {
-        return("");
-    }
+    hid_get_serial_number_string(dev, tmpName, szTemp);
+    std::wstring wName  = std::wstring(tmpName);
+    std::string serial  = std::string(wName.begin(), wName.end());
 
-    return(StringUtils::wstring_to_string(serial_string));
+    return serial;
 }
 
 std::string BloodyB820RController::GetLocation()
@@ -54,12 +50,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);
 }
@@ -79,12 +75,14 @@ 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}
@@ -101,4 +99,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.h

@@ -1,21 +1,19 @@
-/*---------------------------------------------------------*\
-| 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
+/*-------------------------------------------------------------------*\
+|  BloodyB820RController.h                                            |
+|                                                                     |
+|  Driver for A4Tech Bloody B820R Keyboard Controller                 |
+|                                                                     |
+|  Mohammed Julfikar Ali Mahbub (o-julfikar)          01 Apr 2024     |
+|                                                                     |
+\*-------------------------------------------------------------------*/
 
 #include <string>
-#include <hidapi.h>
+#include <hidapi/hidapi.h>
 #include "RGBController.h"
 
-#define HID_MAX_STR                     255
+#pragma once
+#define NA                                      0xFFFFFFFF
+#define HID_MAX_STR                             255
 
 #define BLOODY_B820R_RGB_BUFFER_SIZE    58
 #define BLOODY_B820R_RGB_OFFSET         6
@@ -27,9 +25,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

@@ -1,253 +0,0 @@
-/*---------------------------------------------------------*\
-| 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

@@ -1,35 +0,0 @@
-/*---------------------------------------------------------*\
-| 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.cpp

@@ -1,16 +1,14 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*---------------------------------------------------------------------*\
+|  BloodyMouseController.cpp                                            |
+|                                                                       |
+|  Driver for BloodyMouse USB Controller                                |
+|                                                                       |
+|  Chris M (Dr_No)          30 Jun 2022                                 |
+|                                                                       |
+\*---------------------------------------------------------------------*/
 
 #include "BloodyMouseController.h"
-#include "StringUtils.h"
+#include "LogManager.h"
 
 BloodyMouseController::BloodyMouseController(hid_device* dev_handle, const char* path, uint16_t product_id)
 {
@@ -28,20 +26,26 @@ BloodyMouseController::~BloodyMouseController()
 
 uint16_t BloodyMouseController::GetPid()
 {
-    return(pid);
+    return pid;
 }
 
 std::string BloodyMouseController::GetSerial()
 {
-    wchar_t serial_string[HID_MAX_STR];
-    int ret = hid_get_serial_number_string(dev, serial_string, HID_MAX_STR);
+    const uint8_t   sz  = HID_MAX_STR;
+    wchar_t         tmp[sz];
 
-    if(ret != 0)
+    int ret             = hid_get_serial_number_string(dev, tmp, sz);
+
+    if (ret != 0)
     {
+        LOG_DEBUG("[BloodyMouse] Get HID Serial string failed");
         return("");
     }
 
-    return(StringUtils::wstring_to_string(serial_string));
+    std::wstring w_tmp  = std::wstring(tmp);
+    std::string serial  = std::string(w_tmp.begin(), w_tmp.end());
+
+    return serial;
 }
 
 std::string BloodyMouseController::GetLocation()
@@ -49,7 +53,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 };
 
@@ -61,7 +65,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.h

@@ -1,34 +1,30 @@
-/*---------------------------------------------------------*\
-| 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
+/*---------------------------------------------------------------------*\
+|  BloodyMouseController.h                                              |
+|                                                                       |
+|  Driver for BloodyMouse USB Controller                                |
+|                                                                       |
+|  Chris M (Dr_No)          30 Jun 2022                                 |
+|                                                                       |
+\*---------------------------------------------------------------------*/
 
 #include <string>
-#include <hidapi.h>
+#include <hidapi/hidapi.h>
 #include "RGBController.h"
 
+#pragma once
+
 /*-----------------------------------------------------*\
 | 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
@@ -58,7 +54,6 @@ public:
     std::string     GetLocation();
 
     void            SetLedsDirect(std::vector<RGBColor> colors);
-
 private:
     uint16_t        pid;
     std::string     location;

Controllers/A4TechController/RGBController_BloodyB820R.cpp

@@ -0,0 +1,247 @@
+/*-------------------------------------------------------------------*\
+|  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

@@ -0,0 +1,32 @@
+/*-------------------------------------------------------------------*\
+|  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/A4TechController/RGBController_BloodyMouse.cpp

@@ -1,13 +1,11 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*---------------------------------------------------------------------*\
+|  RGBController_BloodyMouse.cpp                                        |
+|                                                                       |
+|  Driver for BloodyMouse USB Controller                                |
+|                                                                       |
+|  Chris M (Dr_No)          30 Jun 2022                                 |
+|                                                                       |
+\*---------------------------------------------------------------------*/
 
 #include "RGBController_BloodyMouse.h"
 
@@ -109,9 +107,7 @@ 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:
@@ -129,7 +125,7 @@ void RGBController_BloodyMouse::SetupZones()
 
         zone new_zone;
         new_zone.name           = mz.name;
-        new_zone.leds_min       = (unsigned int)mz.zone_leds.size();
+        new_zone.leds_min       = mz.zone_leds.size();
         new_zone.leds_max       = new_zone.leds_min;
         new_zone.leds_count     = new_zone.leds_min;
         new_zone.type           = bool_single ? ZONE_TYPE_SINGLE : ZONE_TYPE_LINEAR;

Controllers/A4TechController/RGBController_BloodyMouse.h

@@ -1,16 +1,13 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*---------------------------------------------------------------------*\
+|  RGBController_BloodyMouse.h                                          |
+|                                                                       |
+|  Driver for BloodyMouse USB Controller                                |
+|                                                                       |
+|  Chris M (Dr_No)          30 Jun 2022                                 |
+|                                                                       |
+\*---------------------------------------------------------------------*/
 
 #pragma once
-
 #include <vector>
 #include "RGBController.h"
 #include "BloodyMouseController.h"

Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp

@@ -1,24 +1,21 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  AMDWraithPrismController.h               |
+|                                           |
+|  Driver for AMD Wraith Prism RGB lighting |
+|  controller                               |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/6/2019   |
+\*-----------------------------------------*/
 
+#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;
@@ -56,7 +53,10 @@ std::string AMDWraithPrismController::GetSerialString()
         return("");
     }
 
-    return(StringUtils::wstring_to_string(serial_string));
+    std::wstring return_wstring = serial_string;
+    std::string return_string(return_wstring.begin(), return_wstring.end());
+
+    return(return_string);
 }
 
 std::string AMDWraithPrismController::GetFirmwareVersionString()

Controllers/AMDWraithPrismController/AMDWraithPrismController.h

@@ -1,20 +1,19 @@
-/*---------------------------------------------------------*\
-| 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
+/*-----------------------------------------*\
+|  AMDWraithPrismController.h               |
+|                                           |
+|  Definitions and types for AMD Wraith     |
+|  Prism lighting controller                |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/6/2019   |
+\*-----------------------------------------*/
 
 #include <string>
-#include <hidapi.h>
+#include <hidapi/hidapi.h>
+
 #include "RGBController.h"
 
+#pragma once
+
 #define AMD_WRAITH_PRISM_FAN_BRIGHTNESS_DEFAULT_MAX     0xFF
 #define AMD_WRAITH_PRISM_FAN_BRIGHTNESS_CYCLE_MAX       0x7F
 

Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp

@@ -1,28 +1,11 @@
-/*---------------------------------------------------------*\
-| 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>
 
-/*---------------------------------------------------------*\
-| AMD Wraith Prism vendor ID                                |
-\*---------------------------------------------------------*/
-#define AMD_WRAITH_PRISM_VID                        0x2516
-
-/*---------------------------------------------------------*\
-| AMD Wraith Prism product ID                               |
-\*---------------------------------------------------------*/
-#define AMD_WRAITH_PRISM_PID                        0x0051
+#define AMD_WRAITH_PRISM_VID 0x2516
+#define AMD_WRAITH_PRISM_PID 0x0051
 
 /******************************************************************************************\
 *                                                                                          *

Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp

@@ -1,13 +1,11 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_AMDWraithPrism.cpp         |
+|                                           |
+|  Generic RGB Interface for AMD Wraith     |
+|  Prism                                    |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/25/2019  |
+\*-----------------------------------------*/
 
 #include "RGBController_AMDWraithPrism.h"
 
@@ -27,14 +25,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";
@@ -140,8 +138,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 };
 
@@ -181,24 +179,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,16 +1,13 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_AMDWraithPrism.h           |
+|                                           |
+|  Generic RGB Interface for AMD Wraith     |
+|  Prism                                    |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/25/2019  |
+\*-----------------------------------------*/
 
 #pragma once
-
 #include "RGBController.h"
 #include "AMDWraithPrismController.h"
 

Controllers/AOCHeadsetController/AOCHeadsetController.cpp

@@ -1,225 +0,0 @@
-/*---------------------------------------------------------*\
-| AOCHeadsetController.cpp                                  |
-|                                                           |
-|   Driver for AOC headset                                  |
-|                                                           |
-|   Adam Honse (CalcProgrammer1)                12 Jan 2025 |
-|                                                           |
-|   This file is part of the OpenRGB project                |
-|   SPDX-License-Identifier: GPL-2.0-only                   |
-\*---------------------------------------------------------*/
-
-#include <cstring>
-#include "AOCHeadsetController.h"
-#include "StringUtils.h"
-
-AOCHeadsetController::AOCHeadsetController(hid_device* dev_handle, const char* path)
-{
-    dev         = dev_handle;
-    location    = path;
-
-    unsigned char usb_buf[16];
-
-    memset(usb_buf, 0, sizeof(usb_buf));
-
-    usb_buf[0] = 0xED;
-
-    hid_write(dev, usb_buf, 2);
-
-    SendStartPacket();
-    SendBeginPacket();
-
-    memset(usb_buf, 0, sizeof(usb_buf));
-
-    usb_buf[0] = 0xED;
-    usb_buf[1] = 0x04;
-    usb_buf[2] = 0x02;
-
-    usb_buf[5] = 0x01;
-
-    hid_send_feature_report(dev, usb_buf, sizeof(usb_buf));
-
-    memset(usb_buf, 0, sizeof(usb_buf));
-
-    usb_buf[0] = 0xED;
-    usb_buf[1] = 0x04;
-    usb_buf[2] = 0x04;
-
-    usb_buf[4] = 0x05;
-    usb_buf[5] = 0xC8;
-
-    hid_send_feature_report(dev, usb_buf, sizeof(usb_buf));
-
-    memset(usb_buf, 0, sizeof(usb_buf));
-
-    usb_buf[0] = 0xED;
-    usb_buf[1] = 0x04;
-    usb_buf[2] = 0x06;
-
-    usb_buf[4] = 0x03;
-
-    hid_send_feature_report(dev, usb_buf, sizeof(usb_buf));
-
-    memset(usb_buf, 0, sizeof(usb_buf));
-
-    usb_buf[0] = 0xED;
-    usb_buf[1] = 0x02;
-    usb_buf[2] = 0x08;
-
-    hid_send_feature_report(dev, usb_buf, sizeof(usb_buf));
-
-    memset(usb_buf, 0, sizeof(usb_buf));
-
-    usb_buf[0] = 0xED;
-    usb_buf[1] = 0x03;
-    usb_buf[2] = 0x09;
-
-    hid_send_feature_report(dev, usb_buf, sizeof(usb_buf));
-
-    memset(usb_buf, 0, sizeof(usb_buf));
-
-    usb_buf[0] = 0xED;
-    usb_buf[1] = 0x03;
-    usb_buf[2] = 0x0A;
-
-    hid_send_feature_report(dev, usb_buf, sizeof(usb_buf));
-
-    memset(usb_buf, 0, sizeof(usb_buf));
-
-    usb_buf[0] = 0xED;
-    usb_buf[1] = 0x02;
-    usb_buf[2] = 0x0B;
-    usb_buf[3] = 0x01;
-
-    hid_send_feature_report(dev, usb_buf, sizeof(usb_buf));
-
-    SendModePacket(0);
-
-    RGBColor color_data = 0;
-    SendColorPacket(&color_data);
-
-    SendApplyPacket();
-
-    memset(usb_buf, 0, sizeof(usb_buf));
-
-    usb_buf[0] = 0xED;
-    usb_buf[1] = 0x02;
-    usb_buf[2] = 0x0B;
-    usb_buf[3] = 0x01;
-
-    hid_send_feature_report(dev, usb_buf, sizeof(usb_buf));
-
-    memset(usb_buf, 0, sizeof(usb_buf));
-
-    usb_buf[0] = 0xED;
-    usb_buf[1] = 0x03;
-    usb_buf[2] = 0x0A;
-    usb_buf[3] = 0x01;
-    usb_buf[4] = 0x01;
-
-    hid_send_feature_report(dev, usb_buf, sizeof(usb_buf));
-}
-
-AOCHeadsetController::~AOCHeadsetController()
-{
-    hid_close(dev);
-}
-
-std::string AOCHeadsetController::GetDeviceLocation()
-{
-    return("HID " + location);
-}
-
-std::string AOCHeadsetController::GetSerialString()
-{
-    wchar_t serial_string[128];
-    int ret = hid_get_serial_number_string(dev, serial_string, 128);
-
-    if(ret != 0)
-    {
-        return("");
-    }
-
-    return(StringUtils::wstring_to_string(serial_string));
-}
-
-/*-------------------------------------------------------------------------------------------------*\
-| Private packet sending functions.                                                                 |
-\*-------------------------------------------------------------------------------------------------*/
-
-void AOCHeadsetController::SendDirect
-    (
-    RGBColor*       color_data
-    )
-{
-    SendStartPacket();
-    SendModePacket(0);
-    SendColorPacket(color_data);
-    SendApplyPacket();
-}
-
-void AOCHeadsetController::SendStartPacket()
-{
-    unsigned char usb_buf[16];
-
-    memset(usb_buf, 0, sizeof(usb_buf));
-
-    usb_buf[0] = 0xFF;
-    usb_buf[1] = 0x02;
-
-    hid_write(dev, usb_buf, sizeof(usb_buf));
-}
-
-void AOCHeadsetController::SendBeginPacket()
-{
-    unsigned char usb_buf[16];
-
-    memset(usb_buf, 0, sizeof(usb_buf));
-
-    usb_buf[0] = 0xFD;
-    usb_buf[1] = 0x01;
-
-    hid_write(dev, usb_buf, sizeof(usb_buf));
-}
-
-void AOCHeadsetController::SendModePacket(unsigned char mode)
-{
-    unsigned char usb_buf[16];
-
-    memset(usb_buf, 0, sizeof(usb_buf));
-
-    usb_buf[0] = 0xFF;
-    usb_buf[1] = 0x03;
-    usb_buf[2] = mode;
-    usb_buf[3] = 0x01;
-
-    hid_write(dev, usb_buf, sizeof(usb_buf));
-}
-
-void AOCHeadsetController::SendColorPacket(RGBColor* color_data)
-{
-    unsigned char usb_buf[16];
-
-    memset(usb_buf, 0, sizeof(usb_buf));
-
-    usb_buf[0] = 0xFF;
-    usb_buf[1] = 0x04;
-
-    usb_buf[4] = RGBGetRValue(color_data[0]);
-    usb_buf[5] = RGBGetGValue(color_data[0]);
-    usb_buf[6] = RGBGetBValue(color_data[0]);
-
-    hid_write(dev, usb_buf, sizeof(usb_buf));
-}
-
-void AOCHeadsetController::SendApplyPacket()
-{
-    unsigned char usb_buf[16];
-
-    memset(usb_buf, 0, sizeof(usb_buf));
-
-    usb_buf[0] = 0xFF;
-    usb_buf[1] = 0x01;
-
-    hid_write(dev, usb_buf, sizeof(usb_buf));
-}

Controllers/AOCHeadsetController/AOCHeadsetController.h

@@ -1,72 +0,0 @@
-/*---------------------------------------------------------*\
-| AOCHeadsetController.h                                    |
-|                                                           |
-|   Driver for AOC headset                                  |
-|                                                           |
-|   Adam Honse (CalcProgrammer1)                12 Jan 2025 |
-|                                                           |
-|   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   |
-\*-----------------------------------------*/
-enum
-{
-    AOC_HEADSET_MODE_STATIC_SINGLE_COLOR       = 0x00,     /* Static mode                  */
-    AOC_HEADSET_MODE_BLINKING                  = 0x01,     /* Blinking mode                */
-    AOC_HEADSET_MODE_BREATHING                 = 0x02,     /* Breathing mode               */
-    AOC_HEADSET_MODE_MUSIC                     = 0x03,     /* Music mode                   */
-};
-
-enum
-{
-    AOC_HEADSET_SPEED_SLOW                     = 0x03,     /* Slowest speed                */
-    AOC_HEADSET_SPEED_MEDIUM                   = 0x02,     /* Medium speed                 */
-    AOC_HEADSET_SPEED_FAST                     = 0x01,     /* Fastest speed                */
-};
-
-class AOCHeadsetController
-{
-public:
-    AOCHeadsetController(hid_device* dev_handle, const char* path);
-    ~AOCHeadsetController();
-
-    std::string GetDeviceLocation();
-    std::string GetSerialString();
-
-    void SendDirect
-            (
-            RGBColor*       color_data
-            );
-
-    void SendPacket
-            (
-            unsigned char   mode,
-            unsigned char   brightness,
-            unsigned char   speed,
-            unsigned char   direction,
-            RGBColor*       color_data
-            );
-
-private:
-    hid_device*             dev;
-    std::string             location;
-
-    void SendStartPacket();
-
-    void SendModePacket(unsigned char mode);
-    void SendBeginPacket();
-
-    void SendColorPacket(RGBColor* color_data);
-
-    void SendApplyPacket();
-};

Controllers/AOCHeadsetController/AOCHeadsetControllerDetect.cpp

@@ -1,44 +0,0 @@
-/*---------------------------------------------------------*\
-| AOCHeadsetControllerDetect.cpp                            |
-|                                                           |
-|   Detector for AOC headset                                |
-|                                                           |
-|   Adam Honse (CalcProgrammer1)                12 Jan 2025 |
-|                                                           |
-|   This file is part of the OpenRGB project                |
-|   SPDX-License-Identifier: GPL-2.0-only                   |
-\*---------------------------------------------------------*/
-
-#include "Detector.h"
-#include "AOCHeadsetController.h"
-#include "RGBController_AOCHeadset.h"
-
-/*-----------------------------------------------------*\
-| AOC Headset IDs                                       |
-\*-----------------------------------------------------*/
-#define AOC_VID                                     0x0D8C
-#define AOC_GH300_PID                               0x01F3
-
-/******************************************************************************************\
-*                                                                                          *
-*   DetectAOCHeadsetControllers                                                            *
-*                                                                                          *
-*       Tests the USB address to see if an AOC Headset controller exists there.            *
-*                                                                                          *
-\******************************************************************************************/
-
-void DetectAOCHeadsetControllers(hid_device_info* info, const std::string& name)
-{
-    hid_device* dev = hid_open_path(info->path);
-
-    if(dev)
-    {
-        AOCHeadsetController*     controller     = new AOCHeadsetController(dev, info->path);
-        RGBController_AOCHeadset* rgb_controller = new RGBController_AOCHeadset(controller);
-        rgb_controller->name                      = name;
-
-        ResourceManager::get()->RegisterRGBController(rgb_controller);
-    }
-}
-
-REGISTER_HID_DETECTOR_IPU("AOC GH300", DetectAOCHeadsetControllers, AOC_VID, AOC_GH300_PID, 3, 0x000C, 0x0001);

Controllers/AOCHeadsetController/RGBController_AOCHeadset.cpp

@@ -1,94 +0,0 @@
-/*---------------------------------------------------------*\
-| RGBController_AOCHeadset.cpp                              |
-|                                                           |
-|   RGBController for AOC headset                           |
-|                                                           |
-|   Adam Honse (CalcProgrammer1)                12 Jan 2025 |
-|                                                           |
-|   This file is part of the OpenRGB project                |
-|   SPDX-License-Identifier: GPL-2.0-only                   |
-\*---------------------------------------------------------*/
-
-#include "RGBController_AOCHeadset.h"
-
-/**------------------------------------------------------------------*\
-    @name AOC Headset
-    @category Headset
-    @type USB
-    @save :x:
-    @direct :white_check_mark:
-    @effects :white_check_mark:
-    @detectors DetectAOCHeadsetControllers
-    @comment
-\*-------------------------------------------------------------------*/
-
-RGBController_AOCHeadset::RGBController_AOCHeadset(AOCHeadsetController* controller_ptr)
-{
-    controller                      = controller_ptr;
-
-    name                            = "AOC Headset Device";
-    vendor                          = "AOC";
-    type                            = DEVICE_TYPE_HEADSET;
-    description                     = "AOC Headset Device";
-    location                        = controller->GetDeviceLocation();
-    serial                          = controller->GetSerialString();
-
-    mode direct;
-    direct.name = "Direct";
-    direct.value = 0;
-    direct.color_mode = MODE_COLORS_PER_LED;
-    direct.flags = MODE_FLAG_HAS_PER_LED_COLOR;
-    modes.push_back(direct);
-
-    SetupZones();
-};
-
-RGBController_AOCHeadset::~RGBController_AOCHeadset()
-{
-    delete controller;
-}
-
-void RGBController_AOCHeadset::SetupZones()
-{
-    zone headset_zone;
-    headset_zone.name          = "Headset";
-    headset_zone.type          = ZONE_TYPE_SINGLE;
-    headset_zone.leds_min      = 1;
-    headset_zone.leds_max      = 1;
-    headset_zone.leds_count    = 1;
-    headset_zone.matrix_map    = NULL;
-    zones.push_back(headset_zone);
-
-    led headset_led;
-    headset_led.name           = "Headset";
-    leds.push_back(headset_led);
-
-    SetupColors();
-}
-
-void RGBController_AOCHeadset::ResizeZone(int /*zone*/, int /*new_size*/)
-{
-    /*---------------------------------------------------------*\
-    | This device does not support resizing zones               |
-    \*---------------------------------------------------------*/
-}
-
-void RGBController_AOCHeadset::DeviceUpdateLEDs()
-{
-    DeviceUpdateMode();
-}
-
-void RGBController_AOCHeadset::UpdateZoneLEDs(int /*zone*/)
-{
-    DeviceUpdateLEDs();
-}
-
-void RGBController_AOCHeadset::UpdateSingleLED(int /*led*/)
-{
-    DeviceUpdateLEDs();
-}
-
-void RGBController_AOCHeadset::DeviceUpdateMode()
-{
-    controller->SendDirect(&colors[0]);
-}

Controllers/AOCHeadsetController/RGBController_AOCHeadset.h

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

Controllers/AOCKeyboardController/AOCKeyboardController.cpp

@@ -1,19 +1,17 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  AOCKeyboardController.cpp                |
+|                                           |
+|  Driver for AOC Keyboard lighting         |
+|  controller                               |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 5/10/2023   |
+\*-----------------------------------------*/
 
-#include <chrono>
-#include <cstring>
-#include <thread>
 #include "AOCKeyboardController.h"
-#include "StringUtils.h"
+
+#include <cstring>
+#include <chrono>
+#include <thread>
 
 using namespace std::chrono_literals;
 
@@ -43,7 +41,10 @@ std::string AOCKeyboardController::GetSerialString()
         return("");
     }
 
-    return(StringUtils::wstring_to_string(serial_string));
+    std::wstring return_wstring = serial_string;
+    std::string return_string(return_wstring.begin(), return_wstring.end());
+
+    return(return_string);
 }
 
 void AOCKeyboardController::SetLightingConfig

Controllers/AOCKeyboardController/AOCKeyboardController.h

@@ -1,20 +1,18 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  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>
 
 #pragma once
 
-#include <string>
-#include <hidapi.h>
-#include "RGBController.h"
-
 /*-----------------------------------------*\
 | AOC Keyboard Modes                        |
 \*-----------------------------------------*/

Controllers/AOCKeyboardController/AOCKeyboardControllerDetect.cpp

@@ -1,20 +1,10 @@
-/*---------------------------------------------------------*\
-| 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 Keyboard IDs                                      |
+| AOC Mousemat IDs                                      |
 \*-----------------------------------------------------*/
 #define AOC_VID                                     0x3938
 #define AOC_GK500_PID                               0x1178
@@ -43,4 +33,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,13 +1,10 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_AOCKeyboard.cpp            |
+|                                           |
+|  Generic RGB Interface for AOC keyboard   |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 5/10/2023   |
+\*-----------------------------------------*/
 
 #include "RGBController_AOCKeyboard.h"
 #include "KeyboardLayoutManager.h"
@@ -35,10 +32,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,    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,
+        /* 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,
         /* 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
     },
@@ -50,14 +47,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";
@@ -291,7 +288,7 @@ void RGBController_AOCKeyboard::SetupZones()
     | Create LEDs for the Matrix zone                           |
     |   Place keys in the layout to populate the matrix         |
     \*---------------------------------------------------------*/
-    for(unsigned int led_idx = 0; led_idx < new_zone.leds_count; led_idx++)
+    for(size_t led_idx = 0; led_idx < new_zone.leds_count; led_idx++)
     {
         led new_led;
 
@@ -302,6 +299,8 @@ void RGBController_AOCKeyboard::SetupZones()
 
     zones.push_back(new_zone);
 
+
+
     SetupColors();
 }
 

Controllers/AOCKeyboardController/RGBController_AOCKeyboard.h

@@ -1,13 +1,10 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_AOCKeyboard.h              |
+|                                           |
+|  Generic RGB Interface for AOC keyboard   |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 5/10/2023   |
+\*-----------------------------------------*/
 
 #pragma once
 

Controllers/AOCMouseController/AOCMouseController.cpp

@@ -1,17 +1,14 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  AOCMouseController.cpp                   |
+|                                           |
+|  Driver for AOC Mouse lighting controller |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 4/20/2023   |
+\*-----------------------------------------*/
+
+#include "AOCMouseController.h"
 
 #include <cstring>
-#include "AOCMouseController.h"
-#include "StringUtils.h"
 
 AOCMouseController::AOCMouseController(hid_device* dev_handle, const char* path)
 {
@@ -39,7 +36,10 @@ std::string AOCMouseController::GetSerialString()
         return("");
     }
 
-    return(StringUtils::wstring_to_string(serial_string));
+    std::wstring return_wstring = serial_string;
+    std::string return_string(return_wstring.begin(), return_wstring.end());
+
+    return(return_string);
 }
 
 /*-------------------------------------------------------------------------------------------------*\

Controllers/AOCMouseController/AOCMouseController.h

@@ -1,20 +1,18 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  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>
 
 #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,20 +1,10 @@
-/*---------------------------------------------------------*\
-| 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 Mouse IDs                                         |
+| AOC Mousemat IDs                                      |
 \*-----------------------------------------------------*/
 #define AOC_VID                                     0x3938
 #define AOC_GM500_PID                               0x1179

Controllers/AOCMouseController/RGBController_AOCMouse.cpp

@@ -1,13 +1,10 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_AOCMouse.cpp               |
+|                                           |
+|  Generic RGB Interface for AOC mouse      |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 4/20/2023   |
+\*-----------------------------------------*/
 
 #include "RGBController_AOCMouse.h"
 
@@ -24,14 +21,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,13 +1,10 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_AOCMouse.h                 |
+|                                           |
+|  Generic RGB Interface for AOC mouse      |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 4/20/2023   |
+\*-----------------------------------------*/
 
 #pragma once
 

Controllers/AOCMousematController/AOCMousematController.cpp

@@ -1,17 +1,15 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  AOCMousematController.cpp                |
+|                                           |
+|  Driver for AOC Mousemat lighting         |
+|  controller                               |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 4/15/2023   |
+\*-----------------------------------------*/
+
+#include "AOCMousematController.h"
 
 #include <cstring>
-#include "AOCMousematController.h"
-#include "StringUtils.h"
 
 AOCMousematController::AOCMousematController(hid_device* dev_handle, const char* path)
 {
@@ -39,7 +37,10 @@ std::string AOCMousematController::GetSerialString()
         return("");
     }
 
-    return(StringUtils::wstring_to_string(serial_string));
+    std::wstring return_wstring = serial_string;
+    std::string return_string(return_wstring.begin(), return_wstring.end());
+
+    return(return_string);
 }
 
 /*-------------------------------------------------------------------------------------------------*\

Controllers/AOCMousematController/AOCMousematController.h

@@ -1,20 +1,18 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  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>
 
 #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,16 +1,6 @@
-/*---------------------------------------------------------*\
-| 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"
 
 /*-----------------------------------------------------*\
@@ -41,4 +31,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,13 +1,10 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_AOCMousemat.cpp            |
+|                                           |
+|  Generic RGB Interface for AOC mousemat   |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 4/15/2023   |
+\*-----------------------------------------*/
 
 #include "RGBController_AOCMousemat.h"
 
@@ -24,14 +21,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,13 +1,10 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_AOCMousemat.h              |
+|                                           |
+|  Generic RGB Interface for AOC mousemat   |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 4/15/2023   |
+\*-----------------------------------------*/
 
 #pragma once
 

Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.cpp

@@ -1,22 +1,20 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
-
+/*-----------------------------------------*\
+|  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>
+
 #include "RGBController.h"
 #include "ResourceManager.h"
 #include "SettingsManager.h"
-#include "StringUtils.h"
 #include "ASRockPolychromeUSBController.h"
-#include "dmiinfo.h"
+#include "dependencies/dmiinfo.h"
 
 #define POLYCHROME_USB_READ_ZONE_CONFIG 0x11
 #define POLYCHROME_USB_READ_HEADER      0x14
@@ -57,7 +55,7 @@ PolychromeUSBController::~PolychromeUSBController()
 
 unsigned int PolychromeUSBController::GetChannelCount()
 {
-    return((unsigned int)device_info.size());
+    return(device_info.size());
 }
 
 std::string PolychromeUSBController::GetDeviceLocation()
@@ -80,7 +78,10 @@ std::string PolychromeUSBController::GetSerialString()
         return("");
     }
 
-    return(StringUtils::wstring_to_string(serial_string));
+    std::wstring return_wstring = serial_string;
+    std::string return_string(return_wstring.begin(), return_wstring.end());
+
+    return(return_string);
 }
 
 void PolychromeUSBController::SetDeviceInfo()
@@ -380,7 +381,7 @@ void PolychromeUSBController::WriteRGSwap
     bool chnl8
     )
 {
-    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))};
+    unsigned char rgconfig[1] = {static_cast<unsigned char>(((chnl8 << 7) | (pcb << 6) | (io << 5) | (pch << 4) | (ahdr1 << 3) | (ahdr0 << 2) | (hdr1 << 1) | hdr0))};
     WriteHeader(POLYCHROME_USB_RGSWAP_CFG, rgconfig, 1);
 }
 

Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.h

@@ -1,21 +1,19 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  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>
 
 #pragma once
 
-#include <string>
-#include <hidapi.h>
-#include "RGBController.h"
-
 /*----------------------------------------------------------------------------------------------*\
 | Definitions for Polychrome USB                                                                 |
 \*----------------------------------------------------------------------------------------------*/
@@ -156,11 +154,12 @@ 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,19 +1,13 @@
-/*---------------------------------------------------------*\
-| 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                                          |
@@ -38,5 +32,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,17 +1,15 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_ASRockPolychromeUSB.cpp    |
+|                                           |
+|  Generic RGB Interface for OpenRGB        |
+|  ASRock Polychrome USB Driver             |
+|                                           |
+|  Ed Kambulow (Dredvard) 12/26/2020        |
+|  Shady Nawara (ShadyNawara) 01/16/2023    |
+\*-----------------------------------------*/
 
-#include <string.h>
 #include "RGBController_ASRockPolychromeUSB.h"
+#include <string.h>
 
 #define ASROCK_USB_MAX_ZONES        8
 #define ASROCK_ADDRESSABLE_MAX_LEDS 100
@@ -295,7 +293,7 @@ void RGBController_PolychromeUSB::DeviceUpdateLEDs()
             set_mode = active_mode;
         }
 
-        controller->WriteZone((unsigned char)zone_idx, set_mode, zones_info[zone_idx].speed, zones[zone_idx].colors[0], false);
+        controller->WriteZone(zone_idx, set_mode, zones_info[zone_idx].speed, zones[zone_idx].colors[0], false);
     }
 }
 

Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.h

@@ -1,14 +1,12 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_ASRockPolychromeUSB.h      |
+|                                           |
+|  Generic RGB Interface for OpenRGB        |
+|  ASRock Polychrome USB Driver             |
+|                                           |
+|  Ed Kambulow (Dredvard) 12/26/2020        |
+|  Shady Nawara (ShadyNawara) 01/16/2023    |
+\*-----------------------------------------*/
 
 #pragma once
 
@@ -31,6 +29,7 @@ public:
     void        DeviceUpdateMode();
 
 private:
+    bool                            initializedMode;
     PolychromeUSBController*        controller;
     std::vector<PolychromeZoneInfo> zones_info;
 

Controllers/ASRockSMBusController/ASRockASRRGBSMBusController.cpp

@@ -1,17 +1,15 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  ASRockPolychromeSMBusController.cpp      |
+|                                           |
+|  Driver for for ASRock ASR LED and        |
+|  Polychrome RGB lighting controller       |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/14/2019  |
+\*-----------------------------------------*/
 
 #include "ASRockASRRGBSMBusController.h"
 #include <cstring>
-#include "dmiinfo.h"
+#include "dependencies/dmiinfo.h"
 #include "LogManager.h"
 
 #define ASROCK_ZONE_LED_COUNT_MESSAGE_EN    "[%s] Zone %i LED count: %02d"
@@ -66,7 +64,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.h

@@ -1,19 +1,18 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  ASRockASRRGBSMBusController.h        |
+|                                           |
+|  Definitions and types for ASRock         |
+|  ASR LED and Polychrome RGB lighting      |
+|  controller                               |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/13/2019  |
+\*-----------------------------------------*/
+
+#include "i2c_smbus.h"
+#include <string>
 
 #pragma once
 
-#include <string>
-#include "i2c_smbus.h"
-
 typedef uint8_t	polychrome_dev_id;
 
 #define ASROCK_ASR_CONTROLLER_NAME  "ASRock ASR RGB SMBus Controller"
@@ -64,7 +63,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.h

@@ -1,35 +0,0 @@
-/*---------------------------------------------------------*\
-| 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.cpp

@@ -1,17 +1,15 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  ASRockPolychromeV1SMBusController.cpp    |
+|                                           |
+|  Driver for for ASRock ASR LED and        |
+|  Polychrome RGB lighting controller       |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/14/2019  |
+\*-----------------------------------------*/
 
-#include <cstring>
 #include "ASRockPolychromeV1SMBusController.h"
-#include "dmiinfo.h"
+#include <cstring>
+#include "dependencies/dmiinfo.h"
 #include "LogManager.h"
 
 #define ASROCK_ZONE_LED_COUNT_MESSAGE_EN    "[%s] Zone %i LED count: %02d"

Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController.h

@@ -1,19 +1,18 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  ASRockPolychromeV1SMBusController.h      |
+|                                           |
+|  Definitions and types for ASRock         |
+|  ASR LED and Polychrome RGB lighting      |
+|  controller                               |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/13/2019  |
+\*-----------------------------------------*/
 
-#pragma once
-
-#include <string>
 #include "i2c_smbus.h"
 #include "RGBController.h"
+#include <string>
+
+#pragma once
 
 typedef uint8_t	polychrome_dev_id;
 

Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController/RGBController_ASRockPolychromeV1SMBus.h

@@ -1,38 +0,0 @@
-/*---------------------------------------------------------*\
-| 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.cpp

@@ -1,17 +1,15 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  ASRockPolychromeV2SMBusController.cpp    |
+|                                           |
+|  Driver for for ASRock ASR LED and        |
+|  Polychrome RGB lighting controller       |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/14/2019  |
+\*-----------------------------------------*/
 
-#include <cstring>
 #include "ASRockPolychromeV2SMBusController.h"
-#include "dmiinfo.h"
+#include <cstring>
+#include "dependencies/dmiinfo.h"
 #include "LogManager.h"
 
 #define ASROCK_ZONE_LED_COUNT_MESSAGE_EN    "[%s] Zone %i LED count: %02d"

Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController.h

@@ -1,19 +1,18 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  ASRockPolychromeSMBusController.h        |
+|                                           |
+|  Definitions and types for ASRock         |
+|  ASR LED and Polychrome RGB lighting      |
+|  controller                               |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/13/2019  |
+\*-----------------------------------------*/
+
+#include "i2c_smbus.h"
+#include <string>
 
 #pragma once
 
-#include <string>
-#include "i2c_smbus.h"
-
 typedef uint8_t polychrome_dev_id;
 
 #define ASROCK_V2_CONTROLLER_NAME  "ASRock Polychrome v2 SMBus Controller"
@@ -133,7 +132,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.h

@@ -1,36 +0,0 @@
-/*---------------------------------------------------------*\
-| 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,26 +1,17 @@
-/*---------------------------------------------------------*\
-| 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.cpp

@@ -1,13 +1,11 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_ASRockPolychromeSMBus.cpp  |
+|                                           |
+|  Generic RGB Interface for OpenRGB        |
+|  ASRock ASR LED and Polychrome RGB Driver |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/15/2019  |
+\*-----------------------------------------*/
 
 #include "RGBController_ASRockASRRGBSMBus.h"
 
@@ -169,7 +167,7 @@ void RGBController_ASRockASRRGBSMBus::ResizeZone(int /*zone*/, int /*new_size*/)
 
 void RGBController_ASRockASRRGBSMBus::DeviceUpdateLEDs()
 {
-    for(unsigned int led = 0; led < colors.size(); led++)
+    for (std::size_t led = 0; led < colors.size(); led++)
     {
         UpdateSingleLED(led);
     }

Controllers/ASRockSMBusController/RGBController_ASRockASRRGBSMBus.h

@@ -0,0 +1,33 @@
+/*-----------------------------------------*\
+|  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.cpp

@@ -1,14 +1,11 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_ASRockPolychromeSMBus.cpp  |
+|                                           |
+|  Generic RGB Interface for OpenRGB        |
+|  ASRock ASR LED and Polychrome RGB Driver |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/15/2019  |
+\*-----------------------------------------*/
 
 #include "LogManager.h"
 #include "RGBController_ASRockPolychromeV1SMBus.h"

Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV1SMBus.h

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

Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV2SMBus.cpp

@@ -1,14 +1,11 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_ASRockPolychromeV2SMBus.cpp|
+|                                           |
+|  Generic RGB Interface for OpenRGB        |
+|  ASRock ASR LED and Polychrome RGB Driver |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 12/15/2019  |
+\*-----------------------------------------*/
 
 #include "RGBController_ASRockPolychromeV2SMBus.h"
 
@@ -290,7 +287,7 @@ void RGBController_ASRockPolychromeV2SMBus::ResizeZone(int /*zone*/, int /*new_s
 
 void RGBController_ASRockPolychromeV2SMBus::DeviceUpdateLEDs()
 {
-    for(unsigned int led = 0; led < colors.size(); led++)
+    for (std::size_t led = 0; led < colors.size(); led++)
     {
         UpdateSingleLED(led);
     }

Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV2SMBus.h

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

Controllers/AlienwareController/AlienwareController.cpp

@@ -1,14 +1,13 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  AlienwareController.cpp                  |
+|                                           |
+|  Driver for Alienware lighting controller |
+|                                           |
+|  Gabriel Marcano (gemarcano) 4/21/2021    |
+\*-----------------------------------------*/
 
+#include "RGBController.h"
+#include "AlienwareController.h"
 #include <cstring>
 #include <cstdint>
 #include <map>
@@ -16,10 +15,7 @@
 #include <chrono>
 #include <algorithm>
 #include <sstream>
-#include "RGBController.h"
-#include "AlienwareController.h"
 #include "LogManager.h"
-#include "StringUtils.h"
 
 typedef uint32_t alienware_platform_id;
 
@@ -31,8 +27,7 @@ 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
-    { 0x0E0A,   4 }     // Dell G15   5530
+    { 0x0E03,   4 }     // Dell G15   5511
 
 };
 
@@ -48,8 +43,7 @@ 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"    } },
-    { 0x0E0A,   { "Left",           "Middle",       "Right",        "Numpad"    } }
+    { 0x0E03,   { "Left",           "Middle",       "Right",        "Numpad"    } }
 };
 
 static void SendHIDReport(hid_device *dev, const unsigned char* usb_buf, size_t usb_buf_size)
@@ -90,7 +84,9 @@ AlienwareController::AlienwareController(hid_device* dev_handle, const hid_devic
     /*-----------------------------------------------------*\
     | Get serial number                                     |
     \*-----------------------------------------------------*/
-    serial_number       = StringUtils::wstring_to_string(info.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());
 
     /*-----------------------------------------------------*\
     | Get zone information by checking firmware             |
@@ -171,7 +167,7 @@ AlienwareController::~AlienwareController()
 
 unsigned int AlienwareController::GetZoneCount()
 {
-    return((unsigned int)zones.size());
+    return(zones.size());
 }
 
 std::vector<const char*> AlienwareController::GetZoneNames()
@@ -276,7 +272,7 @@ bool AlienwareController::Dim(std::vector<uint8_t> zones, double percent)
     /*-----------------------------------------------------*\
     | Set up message packet with leading 00, per hidapi     |
     \*-----------------------------------------------------*/
-    uint16_t num_zones  = (uint16_t)zones.size();
+    uint16_t num_zones  = zones.size();
 
     usb_buf[0x00]       = 0x00;
     usb_buf[0x01]       = 0x03;
@@ -380,7 +376,7 @@ bool AlienwareController::SelectZones(const std::vector<uint8_t>& zones)
     /*-----------------------------------------------------*\
     | Set up message packet with leading 00, per hidapi     |
     \*-----------------------------------------------------*/
-    uint16_t num_zones  = (uint16_t)zones.size();
+    uint16_t num_zones  = zones.size();
 
     usb_buf[0x00]       = 0x00;
     usb_buf[0x01]       = 0x03;
@@ -519,7 +515,7 @@ bool AlienwareController::SetColorDirect(RGBColor color, std::vector<uint8_t> zo
     /*-----------------------------------------------------*\
     | Set up message packet with leading 00, per hidapi     |
     \*-----------------------------------------------------*/
-    uint16_t num_zones      = (uint16_t)zones.size();
+    uint16_t num_zones      = zones.size();
 
     usb_buf[0x00]           = 0x00;
     usb_buf[0x01]           = 0x03;
@@ -655,7 +651,7 @@ void AlienwareController::UpdateDim()
 
     for(size_t i = 0; i < zones.size(); i++)
     {
-        dim_zone_map[zones[i].dim].emplace_back((uint8_t)i);
+        dim_zone_map[zones[i].dim].emplace_back(i);
     }
 
     for(std::pair<const uint8_t, std::vector<uint8_t>> &pair : dim_zone_map)
@@ -682,7 +678,7 @@ bool AlienwareController::UpdateDirect()
 
     for(size_t i = 0; i < zones.size(); i++)
     {
-        color_zone_map[zones[i].color[0]].emplace_back((uint8_t)i);
+        color_zone_map[zones[i].color[0]].emplace_back(i);
     }
 
     for(std::pair<const RGBColor, std::vector<uint8_t>> &pair : color_zone_map)

Controllers/AlienwareController/AlienwareController.h

@@ -1,20 +1,18 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  AlienwareController.h                    |
+|                                           |
+|  Driver for Dell Alienware RGB USB        |
+|  controller                               |
+|                                           |
+|  Gabriel Marcano (gemarcano) 4/19/2021    |
+\*-----------------------------------------*/
+
+#include "RGBController.h"
+#include <hidapi/hidapi.h>
+#include <string>
 
 #pragma once
 
-#include <string>
-#include <hidapi.h>
-#include "RGBController.h"
-
 /*----------------------------------------------------------------------------------------------*\
 | Definitions for Alienware Controller                                                           |
 \*----------------------------------------------------------------------------------------------*/

Controllers/AlienwareController/AlienwareControllerDetect.cpp

@@ -1,14 +1,6 @@
-/*---------------------------------------------------------*\
-| 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"
 
 /*---------------------------------------------------------*\
@@ -19,8 +11,7 @@
 /*---------------------------------------------------------*\
 | Alienware product ID                                      |
 \*---------------------------------------------------------*/
-#define ALIENWARE_G_SERIES_PID1                      0x0550
-#define ALIENWARE_G_SERIES_PID2                      0x0551
+#define ALIENWARE_G_SERIES_PID                         0x0550
 
 void DetectAlienwareControllers(hid_device_info* info, const std::string& name)
 {
@@ -35,5 +26,4 @@ void DetectAlienwareControllers(hid_device_info* info, const std::string& name)
     }
 }
 
-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);
+REGISTER_HID_DETECTOR("Dell G Series LED Controller", DetectAlienwareControllers, ALIENWARE_VID, ALIENWARE_G_SERIES_PID);

Controllers/AlienwareController/RGBController_Alienware.cpp

@@ -1,17 +1,16 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_Alienware.cpp              |
+|                                           |
+|  Generic RGB Interface for OpenRGB        |
+|  Alienware USB Driver                     |
+|                                           |
+|  Gabriel Marcano (gemarcano) 4/19/2021    |
+\*-----------------------------------------*/
+
+#include "RGBController_Alienware.h"
 
 #include <thread>
 #include <chrono>
-#include "RGBController_Alienware.h"
 
 /**------------------------------------------------------------------*\
     @name Alienware
@@ -214,7 +213,7 @@ void RGBController_Alienware::DeviceUpdateMode()
         /*-----------------------------------------------------*\
         | Setup state per zone                                  |
         \*-----------------------------------------------------*/
-        for(uint8_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
+        for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
         {
             zone current_zone = zones[zone_idx];
 

Controllers/AlienwareController/RGBController_Alienware.h

@@ -1,20 +1,19 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_Alienware.h                |
+|                                           |
+|  Generic RGB Interface for OpenRGB        |
+|  Alienware RGB USB Driver                 |
+|                                           |
+|  Gabriel Marcano (gemarcano) 4/19/2021    |
+\*-----------------------------------------*/
 
 #pragma once
 
-#include <chrono>
 #include "RGBController.h"
 #include "AlienwareController.h"
 
+#include <chrono>
+
 class RGBController_Alienware : public RGBController
 {
 public:

Controllers/AlienwareKeyboardController/AlienwareAW410KController.cpp

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

Controllers/AlienwareKeyboardController/AlienwareAW410KController.h

@@ -1,20 +1,20 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*------------------------------------------------------*\
+|  AlienwareAW410KController.h                           |
+|                                                        |
+|  Definitions and types for alienware                   |
+|  AW410K Keyboard                                       |
+|                                                        |
+|  based on AW510K controller by Mohamad Sallal - msallal|
+|                                                        |
+|  Dominik Mikolajczyk - dmiko 23/10/2023                |
+\*------------------------------------------------------*/
 
-#pragma once
+#include "RGBController.h"
 
 #include <string>
-#include <hidapi.h>
-#include "RGBController.h"
+#include <hidapi/hidapi.h>
+
+#pragma once
 
 enum
 {
@@ -109,7 +109,7 @@ public:
     void        SetMode
                     (
                     unsigned char   mode,
-                    unsigned char   speed,
+                    unsigned short  speed,
                     unsigned char   direction,
                     unsigned char   colorMode,
                     unsigned char   red,
@@ -120,7 +120,7 @@ public:
     void        SetMorphMode
                     (
                     unsigned char   mode,
-                    unsigned char   speed,
+                    unsigned short  speed,
                     unsigned char   red1,
                     unsigned char   green1,
                     unsigned char   blue1,
@@ -145,7 +145,7 @@ private:
                     (
                     unsigned char   zone,
                     unsigned char   mode,
-                    unsigned char   speed,
+                    unsigned short  speed,
                     unsigned char   direction,
                     unsigned char   colorMode,
                     unsigned char   red,

Controllers/AlienwareKeyboardController/AlienwareAW410KController/RGBController_AlienwareAW410K.h

@@ -1,37 +0,0 @@
-/*---------------------------------------------------------*\
-| 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.cpp

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

Controllers/AlienwareKeyboardController/AlienwareAW510KController.h

@@ -1,19 +1,18 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  AlienwareAW510KController.h              |
+|                                           |
+|  Definitions and types for alienware      |
+|  AW510K Keyboard                          |
+|                                           |
+|  Mohamad Sallal - msallal      05/22/2021 |
+\*-----------------------------------------*/
 
-#pragma once
+#include "RGBController.h"
 
 #include <string>
-#include <hidapi.h>
-#include "RGBController.h"
+#include <hidapi/hidapi.h>
+
+#pragma once
 
 enum
 {
@@ -111,7 +110,7 @@ public:
     void        SetMode
                     (
                     unsigned char   mode,
-                    unsigned char   speed,
+                    unsigned short  speed,
                     unsigned char   direction,
                     unsigned char   colorMode,
                     unsigned char   red,
@@ -122,7 +121,7 @@ public:
     void        SetMorphMode
                     (
                     unsigned char   mode,
-                    unsigned char   speed,
+                    unsigned short  speed,
                     unsigned char   red1,
                     unsigned char   green1,
                     unsigned char   blue1,
@@ -147,7 +146,7 @@ private:
                     (
                     unsigned char   zone,
                     unsigned char   mode,
-                    unsigned char   speed,
+                    unsigned short  speed,
                     unsigned char   direction,
                     unsigned char   colorMode,
                     unsigned char   red,

Controllers/AlienwareKeyboardController/AlienwareAW510KController/RGBController_AlienwareAW510K.h

@@ -1,36 +0,0 @@
-/*---------------------------------------------------------*\
-| 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,29 +1,21 @@
-/*---------------------------------------------------------*\
-| 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.cpp

@@ -1,18 +1,17 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*------------------------------------------------------*\
+|  RGBController_AlienwareAW410K.cpp                     |
+|                                                        |
+|  Generic RGB Interface for alienware                   |
+|  AW410K Keyboard                                       |
+|                                                        |
+|  based on AW510K controller by Mohamad Sallal - msallal|
+|                                                        |
+|  Dominik Mikolajczyk - dmiko 23/10/2023                |
+\*------------------------------------------------------*/
 
-#include <iterator>
 #include "RGBControllerKeyNames.h"
 #include "RGBController_AlienwareAW410K.h"
+#include <iterator>
 
 //0xFFFFFFFF indicates an unused entry in matrix
 #define NA  0xFFFFFFFF
@@ -411,7 +410,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/RGBController_AlienwareAW410K.h

@@ -0,0 +1,36 @@
+/*------------------------------------------------------*\
+|  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.cpp

@@ -1,17 +1,15 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_AlienwareAW510K.cpp        |
+|                                           |
+|  Generic RGB Interface for alienware      |
+|  AW510K Keyboard                          |
+|                                           |
+|  Mohamad Sallal - msallal      05/22/2021 |
+\*-----------------------------------------*/
 
-#include <iterator>
 #include "RGBControllerKeyNames.h"
 #include "RGBController_AlienwareAW510K.h"
+#include <iterator>
 
 //0xFFFFFFFF indicates an unused entry in matrix
 #define NA  0xFFFFFFFF

Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.h

@@ -0,0 +1,34 @@
+/*-----------------------------------------*\
+|  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/AnnePro2Controller/AnnePro2Controller.cpp

@@ -1,36 +1,32 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  AnnePro2Controller.cpp                   |
+|                                           |
+|  Driver for Obins Lab AnnePro2 keyboard   |
+|                                           |
+|  Sergey Gavrilov (DrZlo13) 06/06/2021     |
+\*-----------------------------------------*/
 
 #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);
@@ -40,10 +36,13 @@ std::string AnnePro2Controller::GetSerialString()
         return("");
     }
 
-    return(StringUtils::wstring_to_string(serial_string));
+    std::wstring return_wstring = serial_string;
+    std::string return_string(return_wstring.begin(), return_wstring.end());
+
+    return(return_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 |
@@ -75,7 +74,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,20 +1,19 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  AnnePro2Controller.h                     |
+|                                           |
+|  Driver for Obins Lab AnnePro2 keyboard   |
+|                                           |
+|  Sergey Gavrilov (DrZlo13) 06/06/2021     |
+\*-----------------------------------------*/
 
 #pragma once
+#include "RGBController.h"
 
 #include <string>
 #include <vector>
-#include <hidapi.h>
-#include "RGBController.h"
+#include <hidapi/hidapi.h>
+
+#pragma once
 
 class AnnePro2Controller
 {
@@ -34,4 +33,4 @@ public:
 private:
     hid_device*                 dev;
     std::string                 location;
-};
+};

Controllers/AnnePro2Controller/AnnePro2ControllerDetect.cpp

@@ -1,33 +1,16 @@
-/*---------------------------------------------------------*\
-| 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.h>
+#include <hidapi/hidapi.h>
 
-/*---------------------------------------------------------*\
-| 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
+#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
 
 /******************************************************************************************\
 *                                                                                          *

Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp

@@ -1,13 +1,11 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_AnnePro2.cpp               |
+|                                           |
+|  Generic RGB Interface for Obins Lab      |
+|  AnnePro2 keyboard                        |
+|                                           |
+|  Sergey Gavrilov (DrZlo13) 06/06/2021     |
+\*-----------------------------------------*/
 
 #include "RGBControllerKeyNames.h"
 #include "RGBController_AnnePro2.h"

Controllers/AnnePro2Controller/RGBController_AnnePro2.h

@@ -1,16 +1,13 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_AnnePro2.h                 |
+|                                           |
+|  Generic RGB Interface for Obins Lab      |
+|  AnnePro2 keyboard                        |
+|                                           |
+|  Sergey Gavrilov (DrZlo13) 06/06/2021     |
+\*-----------------------------------------*/
 
 #pragma once
-
 #include "RGBController.h"
 #include "AnnePro2Controller.h"
 

Controllers/ArcticController/ArcticController.cpp

@@ -1,16 +1,13 @@
-/*---------------------------------------------------------*\
-| 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                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  ArcticController.h                       |
+|                                           |
+|  Controller Interface for Arctic devices  |
+|                                           |
+|  Armin Wolf (Wer-Wolf) 01/09/2023         |
+\*-----------------------------------------*/
 
-#include <cstring>
 #include "ArcticController.h"
+#include <cstring>
 
 using namespace std::chrono_literals;
 

Controllers/ArcticController/ArcticController.h

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

Controllers/ArcticController/ArcticControllerDetect.cpp

@@ -1,19 +1,19 @@
-/*---------------------------------------------------------*\
-| ArcticControllerDetect.cpp                                |
-|                                                           |
-|   Detector for Arctic devices                             |
-|                                                           |
-|   Armin Wolf (Wer-Wolf)                       09 Jan 2023 |
-|                                                           |
-|   This file is part of the OpenRGB project                |
-|   SPDX-License-Identifier: GPL-2.0-only                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  ArcticControllerDetect.cpp               |
+|                                           |
+|  Detect Arctic RGB controllers            |
+|                                           |
+|  Armin Wolf (Wer-Wolf) 01/09/2023         |
+\*-----------------------------------------*/
 
-#include <vector>
 #include "Detector.h"
 #include "ArcticController.h"
+#include "RGBController.h"
 #include "RGBController_Arctic.h"
 #include "find_usb_serial_port.h"
+#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
 
 #define CH341_VID   0x1A86
 #define CH341_PID   0x7523
@@ -44,5 +44,5 @@ REGISTER_DETECTOR("Arctic RGB controller", DetectArcticControllers);
 /*---------------------------------------------------------------------------------------------------------*\
 | Entries for dynamic UDEV rules                                                                            |
 |                                                                                                           |
-| DUMMY_DEVICE_DETECTOR("Arctic RGB controller", DetectArcticControllers, 0x1A86, 0x7523 )                  |
+| DUMMY_DEVICE_DETECTOR("Arctic RGB controller", DetectArcticControllers, 0x1a86, 0x7523 )                  |
 \*---------------------------------------------------------------------------------------------------------*/

Controllers/ArcticController/RGBController_Arctic.cpp

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

Controllers/ArcticController/RGBController_Arctic.h

@@ -1,21 +1,17 @@
-/*---------------------------------------------------------*\
-| RGBController_Arctic.h                                    |
-|                                                           |
-|   RGBController for Arctic devices                        |
-|                                                           |
-|   Armin Wolf (Wer-Wolf)                       09 Jan 2023 |
-|                                                           |
-|   This file is part of the OpenRGB project                |
-|   SPDX-License-Identifier: GPL-2.0-only                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  RGBController_Arctic.h                   |
+|                                           |
+|  Generic RGB Interface for Arctic devices |
+|                                           |
+|  Armin Wolf (Wer-Wolf) 27/08/2023         |
+\*-----------------------------------------*/
 
 #pragma once
-
-#include <chrono>
-#include <thread>
 #include "ArcticController.h"
 #include "RGBController.h"
 #include "serial_port.h"
+#include <chrono>
+#include <thread>
 
 class RGBController_Arctic : public RGBController
 {

Controllers/AsusAuraCoreController/AsusAuraCoreController.cpp

@@ -1,17 +1,14 @@
-/*---------------------------------------------------------*\
-| AsusAuraCoreController.cpp                                |
-|                                                           |
-|   Driver for ASUS ROG Aura Core                           |
-|                                                           |
-|   Adam Honse (CalcProgrammer1)                13 Apr 2020 |
-|                                                           |
-|   This file is part of the OpenRGB project                |
-|   SPDX-License-Identifier: GPL-2.0-only                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  AsusAuraCoreController.cpp               | 
+|                                           |
+|  Driver for ASUS ROG Aura Core RGB        |
+|  lighting controller                      |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 4/13/2020   |
+\*-----------------------------------------*/
 
-#include <cstring>
 #include "AsusAuraCoreController.h"
-#include "StringUtils.h"
+#include <cstring>
 
 #define AURA_CORE_MAX_MESSAGE_SIZE  64
 
@@ -50,7 +47,10 @@ std::string AuraCoreController::GetSerialString()
         return("");
     }
 
-    return(StringUtils::wstring_to_string(serial_string));
+    std::wstring return_wstring = serial_string;
+    std::string return_string(return_wstring.begin(), return_wstring.end());
+
+    return(return_string);
 }
 
 void AuraCoreController::SendBrightness

Controllers/AsusAuraCoreController/AsusAuraCoreController.h

@@ -1,19 +1,18 @@
-/*---------------------------------------------------------*\
-| AsusAuraCoreController.h                                  |
-|                                                           |
-|   Driver for ASUS ROG Aura Core                           |
-|                                                           |
-|   Adam Honse (CalcProgrammer1)                13 Apr 2020 |
-|                                                           |
-|   This file is part of the OpenRGB project                |
-|   SPDX-License-Identifier: GPL-2.0-only                   |
-\*---------------------------------------------------------*/
+/*-----------------------------------------*\
+|  AsusAuraCoreController.h                 |
+|                                           |
+|  Definitions and types for ASUS ROG Aura  |
+|  Core RGB lighting controller             |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 4/13/2020   |
+\*-----------------------------------------*/
 
-#pragma once
+#include "RGBController.h"
 
 #include <string>
-#include <hidapi.h>
-#include "RGBController.h"
+#include <hidapi/hidapi.h>
+
+#pragma once
 
 enum AuraCoreDeviceType
 {
@@ -120,4 +119,5 @@ private:
     void    Handshake();
     void    SendIdString();
     void    SendQuery();
+
 };

Controllers/AsusAuraCoreController/AsusAuraCoreController/RGBController_AsusAuraCore.h

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

Controllers/AsusAuraCoreController/AsusAuraCoreControllerDetect.cpp

@@ -1,24 +1,14 @@
-/*---------------------------------------------------------*\
-| AsusAuraCoreControllerDetect.cpp                          |
-|                                                           |
-|   Detector for ASUS ROG Aura Core                         |
-|                                                           |
-|   Adam Honse (CalcProgrammer1)                13 Apr 2020 |
-|   Chris M (Dr_No)                             28 Jul 2022 |
-|                                                           |
-|   This file is part of the OpenRGB project                |
-|   SPDX-License-Identifier: GPL-2.0-only                   |
-\*---------------------------------------------------------*/
-
 #include "Detector.h"
 #include "AsusAuraCoreController.h"
 #include "RGBController.h"
 #include "RGBController_AsusAuraCore.h"
 #include "RGBController_AsusAuraCoreLaptop.h"
-#include <hidapi.h>
+#include <hidapi/hidapi.h>
 
 #define AURA_CORE_VID                   0x0B05
 
+#define AURA_STRIX_SCAR_15_PID          0x19B6
+
 /******************************************************************************************\
 *                                                                                          *
 *   DetectAuraCoreControllers                                                              *