Compare commits
442
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fc411345a3 | ||
|
|
d834b18a16 | ||
|
|
698ae9debc | ||
|
|
3da13705af | ||
|
|
5bcc105cd9 | ||
|
|
4aac04280c | ||
|
|
2e64a82caa | ||
|
|
6157668057 | ||
|
|
4bae567c4c | ||
|
|
1e9e790c71 | ||
|
|
4bc14630e9 | ||
|
|
b398dcdcf9 | ||
|
|
bdad1df3d7 | ||
|
|
af3dc18841 | ||
|
|
66109be668 | ||
|
|
6140849e28 | ||
|
|
bd689ee6d7 | ||
|
|
5c26a864f0 | ||
|
|
3edaa65d1d | ||
|
|
38f8fcc3f3 | ||
|
|
de2c58739b | ||
|
|
c071da54ca | ||
|
|
6eac59cea4 | ||
|
|
36a9991d59 | ||
|
|
a5f1372537 | ||
|
|
894380a5d4 | ||
|
|
f95bd77366 | ||
|
|
f1a85915f9 | ||
|
|
1ef8af75ae | ||
|
|
edab781d44 | ||
|
|
1e4f8fdd5b | ||
|
|
c8c632cddd | ||
|
|
f167877a00 | ||
|
|
03a5b11d09 | ||
|
|
1089a29af0 | ||
|
|
e8c9f149a1 | ||
|
|
a1cffba1bf | ||
|
|
848e96f64b | ||
|
|
9be9e34be1 | ||
|
|
fc18e404ce | ||
|
|
398afc721e | ||
|
|
3b61a47ec2 | ||
|
|
6548dea9c4 | ||
|
|
6f7f6d3fe7 | ||
|
|
792a14cf3b | ||
|
|
9d9c6aa5c8 | ||
|
|
d3993bf9df | ||
|
|
b98081771c | ||
|
|
deffa35975 | ||
|
|
bf7f043e4f | ||
|
|
24c6bb2f5f | ||
|
|
9b79a2263a | ||
|
|
0b05f93eee | ||
|
|
4cdee33ae4 | ||
|
|
0027936b1d | ||
|
|
28f7e09558 | ||
|
|
dab4a95dc5 | ||
|
|
c42a5ef9f5 | ||
|
|
ebf5dbedb6 | ||
|
|
5bda1dc79f | ||
|
|
aec411e721 | ||
|
|
34957180be | ||
|
|
aae377a555 | ||
|
|
1ba692a0ea | ||
|
|
c392e2c6ca | ||
|
|
ebcc0deac1 | ||
|
|
643c81e9db | ||
|
|
d3747a2465 | ||
|
|
09bdffab54 | ||
|
|
656d3a40c8 | ||
|
|
749c4d0f37 | ||
|
|
b258f9a683 | ||
|
|
733d7fb0e5 | ||
|
|
a87bd8197c | ||
|
|
3e75452ec8 | ||
|
|
d94a496808 | ||
|
|
773a59cf2e | ||
|
|
4ef2917cf4 | ||
|
|
102dccee72 | ||
|
|
8c2ff38d8d | ||
|
|
8f7e4963de | ||
|
|
10e6e8c91f | ||
|
|
d2be38c992 | ||
|
|
3a62cc8379 | ||
|
|
bbe97538d8 | ||
|
|
05637ba93d | ||
|
|
f825e476b9 | ||
|
|
32d9211e7d | ||
|
|
9f09c7b503 | ||
|
|
b12c27c21e | ||
|
|
0f0f3885aa | ||
|
|
7c1d096d46 | ||
|
|
27342c71ac | ||
|
|
a410c3b350 | ||
|
|
71b27d37a4 | ||
|
|
67dadcbefb | ||
|
|
43de81819b | ||
|
|
d1be4288d3 | ||
|
|
9065cac1fd | ||
|
|
b834cd108d | ||
|
|
97eace697a | ||
|
|
a9406804db | ||
|
|
93f1a18b52 | ||
|
|
b824dbb9db | ||
|
|
2219c7529d | ||
|
|
5ff7bfc168 | ||
|
|
31656bda27 | ||
|
|
ab0dfb0f6a | ||
|
|
3b9aa16ce6 | ||
|
|
d5b682e8b3 | ||
|
|
91adb32c5b | ||
|
|
384fdb2376 | ||
|
|
a44460b48e | ||
|
|
c3dccb071e | ||
|
|
840bf4189a | ||
|
|
aeca035fa3 | ||
|
|
091c4e46f5 | ||
|
|
61c3fc7975 | ||
|
|
fd0ad07a96 | ||
|
|
bb34aba76e | ||
|
|
2225ca0ec4 | ||
|
|
2805476fb8 | ||
|
|
564d817b1c | ||
|
|
8b9a5b460f | ||
|
|
b0d2954a56 | ||
|
|
2ce0163eca | ||
|
|
073203d3b5 | ||
|
|
e2ec7c818e | ||
|
|
b5638eee12 | ||
|
|
61802ed664 | ||
|
|
69f8f644e6 | ||
|
|
fdd04a1511 | ||
|
|
068761872e | ||
|
|
b4d15b9545 | ||
|
|
366fda30f5 | ||
|
|
5dc31a81a0 | ||
|
|
e2126b9d29 | ||
|
|
a2fb9a00fe | ||
|
|
e7240ecca0 | ||
|
|
99c1aa0c26 | ||
|
|
44268596b3 | ||
|
|
64a0d2c061 | ||
|
|
215ae6118a | ||
|
|
f4ff81bd45 | ||
|
|
e42cefdf09 | ||
|
|
4d8466cd60 | ||
|
|
c87efc5d67 | ||
|
|
a970cd9a23 | ||
|
|
94d7703e9e | ||
|
|
2ec4183789 | ||
|
|
a36162a971 | ||
|
|
ef48039a1b | ||
|
|
c366de98e7 | ||
|
|
6fdcca3ca1 | ||
|
|
9c7aad8259 | ||
|
|
a4a457ad5c | ||
|
|
6d0c990834 | ||
|
|
5948da2372 | ||
|
|
dec9081be2 | ||
|
|
ac1c823ca1 | ||
|
|
05d707b8d4 | ||
|
|
b8ca869b19 | ||
|
|
79527ef39a | ||
|
|
3717c752c4 | ||
|
|
7d9279abad | ||
|
|
0709b0768f | ||
|
|
dac57f5a13 | ||
|
|
ea19efd490 | ||
|
|
ad9b1fb61a | ||
|
|
3d93134e86 | ||
|
|
545cb4c9e1 | ||
|
|
1772f5036e | ||
|
|
0856701f90 | ||
|
|
7e501b3a98 | ||
|
|
eca69360e1 | ||
|
|
1b4598576d | ||
|
|
91b7c649c9 | ||
|
|
474b33fef4 | ||
|
|
52eda68a4e | ||
|
|
e2a0032657 | ||
|
|
535e0f177d | ||
|
|
5295132f37 | ||
|
|
da6067d708 | ||
|
|
30869378a4 | ||
|
|
026740eb9a | ||
|
|
88bd7433e2 | ||
|
|
209b62bccc | ||
|
|
4090d556aa | ||
|
|
e99192895b | ||
|
|
a8781ba96b | ||
|
|
8c1a9cd0c7 | ||
|
|
032e3c82d5 | ||
|
|
fa35a490e1 | ||
|
|
f127ae9e41 | ||
|
|
afab4a9447 | ||
|
|
486ecedc12 | ||
|
|
cb8ea601cf | ||
|
|
005212b463 | ||
|
|
d37068b65d | ||
|
|
9699cd60ac | ||
|
|
44aaf3a131 | ||
|
|
260044df0c | ||
|
|
88493da3ab | ||
|
|
0c22a29130 | ||
|
|
06c4d8a66e | ||
|
|
e9b3507526 | ||
|
|
949991f608 | ||
|
|
b9402d8e94 | ||
|
|
a5da1adf09 | ||
|
|
1c10a37ec5 | ||
|
|
222a27ed9e | ||
|
|
ccfb6c9f16 | ||
|
|
8aeab21ba3 | ||
|
|
4156b193b2 | ||
|
|
f8fd3138ef | ||
|
|
b03edcb869 | ||
|
|
d7c3fd1fb1 | ||
|
|
f93baffae6 | ||
|
|
6928c50f48 | ||
|
|
9284ec7360 | ||
|
|
53ff1a628b | ||
|
|
813fcec591 | ||
|
|
a367c0023f | ||
|
|
e33dc2290b | ||
|
|
d9ed4df0bf | ||
|
|
f6259a3139 | ||
|
|
fff639ddd5 | ||
|
|
3ed0bb6918 | ||
|
|
c88eb992f5 | ||
|
|
78c91eb7bf | ||
|
|
e964a874bc | ||
|
|
e300b48f5b | ||
|
|
ef9170ac9a | ||
|
|
27c798fb22 | ||
|
|
e2f08351a0 | ||
|
|
68b8024c84 | ||
|
|
7a2ae83cd0 | ||
|
|
7eaae7cf7d | ||
|
|
494769177f | ||
|
|
0289f0b2d4 | ||
|
|
ce1cdf62aa | ||
|
|
b62c7fb432 | ||
|
|
db8932749e | ||
|
|
5bfa134414 | ||
|
|
82a23344f8 | ||
|
|
80b5072754 | ||
|
|
5df9dcdf9c | ||
|
|
d1a638e6f0 | ||
|
|
d7ffb9e13f | ||
|
|
d1673b3304 | ||
|
|
e3348ea3e6 | ||
|
|
066d48e22f | ||
|
|
796fadd3bc | ||
|
|
0227864ae3 | ||
|
|
15c3d8591c | ||
|
|
72507ea108 | ||
|
|
89c11b5eeb | ||
|
|
ec8921381f | ||
|
|
5e9a180c79 | ||
|
|
49b6ba0303 | ||
|
|
7e0c9cf3e3 | ||
|
|
90d92ddbd5 | ||
|
|
ff404bfd99 | ||
|
|
0934020873 | ||
|
|
a3ded7574c | ||
|
|
410423fdc1 | ||
|
|
51f162bd37 | ||
|
|
9360466b6f | ||
|
|
9e98983c75 | ||
|
|
6aa6f6e456 | ||
|
|
3ab8f00af9 | ||
|
|
f1f1ea37a2 | ||
|
|
90744b58dd | ||
|
|
edb6a8aed0 | ||
|
|
357b236fae | ||
|
|
4cd754530e | ||
|
|
0139b47d85 | ||
|
|
339c146c67 | ||
|
|
940e14c07a | ||
|
|
b3379e8ef3 | ||
|
|
86010b3e8e | ||
|
|
ae7caf002b | ||
|
|
bba59be497 | ||
|
|
b84de85891 | ||
|
|
ea9369f799 | ||
|
|
a0adf9f47d | ||
|
|
481cc6f1bf | ||
|
|
d637d0f850 | ||
|
|
7d1106171c | ||
|
|
3147da5c73 | ||
|
|
a4a3a7b970 | ||
|
|
34ce3b928b | ||
|
|
7c1cb2e4e0 | ||
|
|
d2d342ade7 | ||
|
|
16bc33c18a | ||
|
|
cc5aaadf08 | ||
|
|
a7d7a35b93 | ||
|
|
d9b88ae1b9 | ||
|
|
8bf11c6270 | ||
|
|
dde3e454e7 | ||
|
|
314319c36a | ||
|
|
c48206dade | ||
|
|
5c9951af47 | ||
|
|
bd5473663b | ||
|
|
3cf1f58f30 | ||
|
|
f9c17c75c5 | ||
|
|
2fd4cfb2a8 | ||
|
|
59d1c07075 | ||
|
|
a87803ff26 | ||
|
|
281d3d8c62 | ||
|
|
aac70462c5 | ||
|
|
35b6fd8c28 | ||
|
|
853f12e9c1 | ||
|
|
e4eaef00ca | ||
|
|
1d2a57b8e0 | ||
|
|
e0fa66a82a | ||
|
|
a862af2c80 | ||
|
|
ffe99f0310 | ||
|
|
1d766d4a10 | ||
|
|
a7e76b5869 | ||
|
|
1526cbec6c | ||
|
|
9df2289bf4 | ||
|
|
feefc79757 | ||
|
|
75f895799c | ||
|
|
67f7c40fa5 | ||
|
|
803d1681c4 | ||
|
|
9c19195625 | ||
|
|
eb5c9d91d3 | ||
|
|
1c32d819eb | ||
|
|
f95cfc9aeb | ||
|
|
aa4f58694b | ||
|
|
e924257ddd | ||
|
|
ec59cc59b0 | ||
|
|
281b02b049 | ||
|
|
a9ddbf1b95 | ||
|
|
d15ce7d7ab | ||
|
|
651adb61d6 | ||
|
|
bb488b2a55 | ||
|
|
aa4483183c | ||
|
|
b06ce22abb | ||
|
|
3c08177b58 | ||
|
|
0760e13808 | ||
|
|
94ccb0a3ba | ||
|
|
6e9fd99e0e | ||
|
|
a0c975f186 | ||
|
|
56d26fa3cf | ||
|
|
7a6f86966f | ||
|
|
d995593e76 | ||
|
|
433ac0b8ce | ||
|
|
6c30e92b21 | ||
|
|
52423a325e | ||
|
|
523b01054a | ||
|
|
baa6c1a2e4 | ||
|
|
841b85a589 | ||
|
|
8d14059d2e | ||
|
|
cdcbf5209c | ||
|
|
86784b983c | ||
|
|
3806a8ae04 | ||
|
|
edbcc38518 | ||
|
|
58f9943151 | ||
|
|
be6e890402 | ||
|
|
de17f6b7cb | ||
|
|
cb41353622 | ||
|
|
e8264ae616 | ||
|
|
4723c64666 | ||
|
|
f6e42f0c6d | ||
|
|
47a81009c8 | ||
|
|
a460e01718 | ||
|
|
5f79126313 | ||
|
|
8b0b5bc526 | ||
|
|
fae1e8e9eb | ||
|
|
56753a5821 | ||
|
|
beac78dcb6 | ||
|
|
680821f164 | ||
|
|
13ba7b19ea | ||
|
|
84077e9dc2 | ||
|
|
1f3bcaf52a | ||
|
|
056485fabf | ||
|
|
b43f31ebfb | ||
|
|
1975c63b71 | ||
|
|
c4917d30b0 | ||
|
|
540eaa5366 | ||
|
|
11bb1dcedb | ||
|
|
b3ad41a572 | ||
|
|
d9671e50ad | ||
|
|
40e1d7f0bc | ||
|
|
080e40c4d4 | ||
|
|
af830e5b21 | ||
|
|
acff88590c | ||
|
|
4aa92c6272 | ||
|
|
de7d0a4c76 | ||
|
|
75d77ea608 | ||
|
|
d19df6d931 | ||
|
|
6a8b5ecfa9 | ||
|
|
e27c7e8d64 | ||
|
|
cee3be9113 | ||
|
|
0b78dd3d86 | ||
|
|
e22267fbeb | ||
|
|
c8bafd10aa | ||
|
|
e086085375 | ||
|
|
efd26d4e49 | ||
|
|
3debbc36dd | ||
|
|
b0bb6e7b1b | ||
|
|
019b049d06 | ||
|
|
1b0d915a63 | ||
|
|
2c3e102772 | ||
|
|
502f23e102 | ||
|
|
cd5b8e08c7 | ||
|
|
8650ec51ae | ||
|
|
b93e6be0b0 | ||
|
|
211497193d | ||
|
|
794f6a81e9 | ||
|
|
df379e680f | ||
|
|
1bdc8dfa7a | ||
|
|
a6c3bdd4f1 | ||
|
|
19e5626d50 | ||
|
|
9f98e8767c | ||
|
|
d5590ed427 | ||
|
|
50ec1095c1 | ||
|
|
9b1ea375b8 | ||
|
|
d9866e3bd4 | ||
|
|
8a77fe5525 | ||
|
|
a51febd0f7 | ||
|
|
acc85f8891 | ||
|
|
d8f3baf8e8 | ||
|
|
4f870489ad | ||
|
|
d78b8d5d40 | ||
|
|
89fd45f1ac | ||
|
|
66a53cde3d | ||
|
|
e4fb4f53ae | ||
|
|
1630d50e72 | ||
|
|
0231a27861 | ||
|
|
1eb2a68a16 | ||
|
|
e9d7b6b103 | ||
|
|
1e53aae676 | ||
|
|
da8469f478 | ||
|
|
fc97d6130b | ||
|
|
889110961a | ||
|
|
02d3b27073 | ||
|
|
88929f9e4c | ||
|
|
93573a93ca | ||
|
|
08304c5474 |
+140
-237
@@ -32,7 +32,10 @@ before_script:
|
||||
#-----------------------------------------------------------------------#
|
||||
"Supported Devices":
|
||||
<<: *ccache_init
|
||||
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bullseye-64
|
||||
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-amd64
|
||||
tags:
|
||||
- linux
|
||||
- amd64
|
||||
stage: build
|
||||
script:
|
||||
- qmake
|
||||
@@ -42,11 +45,7 @@ before_script:
|
||||
artifacts:
|
||||
name: "${CI_PROJECT_NAME}_Supported_Devices_${CI_COMMIT_SHORT_SHA}"
|
||||
paths:
|
||||
- ./*.md
|
||||
- Supported Devices.csv
|
||||
exclude:
|
||||
- README.md
|
||||
- CONTRIBUTING.md
|
||||
expire_in: 30 days
|
||||
|
||||
rules:
|
||||
@@ -57,18 +56,21 @@ before_script:
|
||||
allow_failure: true
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Linux (AppImage) 32-bit Build Target #
|
||||
# Linux (AppImage) i386 Build Target #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Linux 32 AppImage":
|
||||
"Linux i386 AppImage":
|
||||
<<: *ccache_init
|
||||
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-32
|
||||
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-i386
|
||||
tags:
|
||||
- linux
|
||||
- i386
|
||||
stage: build
|
||||
script:
|
||||
- export $(dpkg-architecture)
|
||||
- ./scripts/build-appimage.sh
|
||||
|
||||
artifacts:
|
||||
name: "${CI_PROJECT_NAME}_Linux_32_${CI_COMMIT_SHORT_SHA}"
|
||||
name: "${CI_PROJECT_NAME}_Linux_i386_${CI_COMMIT_SHORT_SHA}"
|
||||
paths:
|
||||
- OpenRGB-i386.AppImage
|
||||
- 60-openrgb.rules
|
||||
@@ -83,18 +85,21 @@ before_script:
|
||||
allow_failure: true
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Linux (AppImage) 64-bit Build Target #
|
||||
# Linux (AppImage) amd64 Build Target #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Linux 64 AppImage":
|
||||
"Linux amd64 AppImage":
|
||||
<<: *ccache_init
|
||||
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-64
|
||||
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-amd64
|
||||
tags:
|
||||
- linux
|
||||
- amd64
|
||||
stage: build
|
||||
script:
|
||||
- export $(dpkg-architecture)
|
||||
- ./scripts/build-appimage.sh
|
||||
|
||||
artifacts:
|
||||
name: "${CI_PROJECT_NAME}_Linux_64_${CI_COMMIT_SHORT_SHA}"
|
||||
name: "${CI_PROJECT_NAME}_Linux_amd64_${CI_COMMIT_SHORT_SHA}"
|
||||
paths:
|
||||
- OpenRGB-x86_64.AppImage
|
||||
- 60-openrgb.rules
|
||||
@@ -102,25 +107,25 @@ before_script:
|
||||
expire_in: 30 days
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Linux (.deb) Debian Buster (Legacy) 32-bit Build Target #
|
||||
# Linux (AppImage) armhf Build Target #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Linux 32 .deb (Debian Buster)":
|
||||
"Linux armhf AppImage":
|
||||
<<: *ccache_init
|
||||
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:buster-32
|
||||
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-armhf
|
||||
tags:
|
||||
- linux
|
||||
- armhf
|
||||
stage: build
|
||||
script:
|
||||
- ./scripts/build-package-files.sh debian/changelog
|
||||
- dpkg-architecture -l
|
||||
- dpkg-buildpackage --target-arch i386 -us -B
|
||||
- rm -v ../openrgb-dbgsym*.*deb
|
||||
- mv -v ../openrgb*.deb ./
|
||||
- export $(dpkg-architecture)
|
||||
- ./scripts/build-appimage.sh
|
||||
|
||||
artifacts:
|
||||
name: "${CI_PROJECT_NAME}_Linux_32_deb_${CI_COMMIT_SHORT_SHA}"
|
||||
name: "${CI_PROJECT_NAME}_Linux_armhf_${CI_COMMIT_SHORT_SHA}"
|
||||
paths:
|
||||
- openrgb*.deb
|
||||
exclude:
|
||||
- openrgb-dbgsym*.*deb
|
||||
- OpenRGB-armhf.AppImage
|
||||
- 60-openrgb.rules
|
||||
- README.md
|
||||
expire_in: 30 days
|
||||
|
||||
rules:
|
||||
@@ -131,25 +136,25 @@ before_script:
|
||||
allow_failure: true
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Linux (.deb) Debian Buster (Legacy) 64-bit Build Target #
|
||||
# Linux (AppImage) arm64 Build Target #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Linux 64 .deb (Debian Buster)":
|
||||
"Linux arm64 AppImage":
|
||||
<<: *ccache_init
|
||||
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:buster-64
|
||||
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-arm64
|
||||
tags:
|
||||
- linux
|
||||
- arm64
|
||||
stage: build
|
||||
script:
|
||||
- ./scripts/build-package-files.sh debian/changelog
|
||||
- dpkg-architecture -l
|
||||
- dpkg-buildpackage -us -B
|
||||
- rm -v ../openrgb-dbgsym*.*deb
|
||||
- mv -v ../openrgb*.deb ./
|
||||
- export $(dpkg-architecture)
|
||||
- ./scripts/build-appimage.sh
|
||||
|
||||
artifacts:
|
||||
name: "${CI_PROJECT_NAME}_Linux_64_deb_${CI_COMMIT_SHORT_SHA}"
|
||||
name: "${CI_PROJECT_NAME}_Linux_arm64_${CI_COMMIT_SHORT_SHA}"
|
||||
paths:
|
||||
- openrgb*.deb
|
||||
exclude:
|
||||
- openrgb-dbgsym*.*deb
|
||||
- OpenRGB-arm64.AppImage
|
||||
- 60-openrgb.rules
|
||||
- README.md
|
||||
expire_in: 30 days
|
||||
|
||||
rules:
|
||||
@@ -160,69 +165,14 @@ before_script:
|
||||
allow_failure: true
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Linux (.deb) Debian Bullseye 32-bit Build Target #
|
||||
# Linux (.deb) Debian Bookworm i386 Build Target #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Linux 32 .deb (Debian Bullseye)":
|
||||
"Linux i386 .deb (Debian Bookworm)":
|
||||
<<: *ccache_init
|
||||
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bullseye-32
|
||||
stage: build
|
||||
script:
|
||||
- ./scripts/build-package-files.sh debian/changelog
|
||||
- dpkg-architecture -l
|
||||
- dpkg-buildpackage --target-arch i386 -us -B
|
||||
- rm -v ../openrgb-dbgsym*.*deb
|
||||
- mv -v ../openrgb*.deb ./
|
||||
|
||||
artifacts:
|
||||
name: "${CI_PROJECT_NAME}_Linux_32_deb_${CI_COMMIT_SHORT_SHA}"
|
||||
paths:
|
||||
- openrgb*.deb
|
||||
exclude:
|
||||
- openrgb-dbgsym*.*deb
|
||||
expire_in: 30 days
|
||||
|
||||
rules:
|
||||
- if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
|
||||
when: on_success
|
||||
- if: $CI_PIPELINE_SOURCE == "push"
|
||||
when: manual
|
||||
allow_failure: true
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Linux (.deb) Debian Bullseye 64-bit Build Target #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Linux 64 .deb (Debian Bullseye)":
|
||||
<<: *ccache_init
|
||||
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bullseye-64
|
||||
stage: build
|
||||
script:
|
||||
- ./scripts/build-package-files.sh debian/changelog
|
||||
- dpkg-architecture -l
|
||||
- dpkg-buildpackage -us -B
|
||||
- rm -v ../openrgb-dbgsym*.*deb
|
||||
- mv -v ../openrgb*.deb ./
|
||||
|
||||
artifacts:
|
||||
name: "${CI_PROJECT_NAME}_Linux_64_deb_${CI_COMMIT_SHORT_SHA}"
|
||||
paths:
|
||||
- openrgb*.deb
|
||||
exclude:
|
||||
- openrgb-dbgsym*.*deb
|
||||
expire_in: 30 days
|
||||
|
||||
rules:
|
||||
- if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
|
||||
when: on_success
|
||||
- if: $CI_PIPELINE_SOURCE == "push"
|
||||
when: manual
|
||||
allow_failure: true
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Linux (.deb) Debian Bookworm 32-bit Build Target #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Linux 32 .deb (Debian Bookworm)":
|
||||
<<: *ccache_init
|
||||
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-32
|
||||
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-i386
|
||||
tags:
|
||||
- linux
|
||||
- i386
|
||||
stage: build
|
||||
script:
|
||||
- ./scripts/build-package-files.sh debian/changelog
|
||||
@@ -232,7 +182,7 @@ before_script:
|
||||
- mv -v ../openrgb*.deb ./
|
||||
|
||||
artifacts:
|
||||
name: "${CI_PROJECT_NAME}_Linux_32_deb_${CI_COMMIT_SHORT_SHA}"
|
||||
name: "${CI_PROJECT_NAME}_Linux_i386_deb_${CI_COMMIT_SHORT_SHA}"
|
||||
paths:
|
||||
- openrgb*.deb
|
||||
exclude:
|
||||
@@ -247,11 +197,14 @@ before_script:
|
||||
allow_failure: true
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Linux (.deb) Debian Bookworm 64-bit Build Target #
|
||||
# Linux (.deb) Debian Bookworm amd64 Build Target #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Linux 64 .deb (Debian Bookworm)":
|
||||
"Linux amd64 .deb (Debian Bookworm)":
|
||||
<<: *ccache_init
|
||||
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-64
|
||||
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-amd64
|
||||
tags:
|
||||
- linux
|
||||
- amd64
|
||||
stage: build
|
||||
script:
|
||||
- ./scripts/build-package-files.sh debian/changelog
|
||||
@@ -261,7 +214,7 @@ before_script:
|
||||
- mv -v ../openrgb*.deb ./
|
||||
|
||||
artifacts:
|
||||
name: "${CI_PROJECT_NAME}_Linux_64_deb_${CI_COMMIT_SHORT_SHA}"
|
||||
name: "${CI_PROJECT_NAME}_Linux_amd64_deb_${CI_COMMIT_SHORT_SHA}"
|
||||
paths:
|
||||
- openrgb*.deb
|
||||
exclude:
|
||||
@@ -276,31 +229,28 @@ before_script:
|
||||
allow_failure: true
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Linux (.rpm, f35) 64-bit Build Target #
|
||||
# Linux (.deb) Debian Bookworm armhf Build Target #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Linux 64 f35 rpm":
|
||||
image: fedora:35
|
||||
"Linux armhf .deb (Debian Bookworm)":
|
||||
<<: *ccache_init
|
||||
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-armhf
|
||||
tags:
|
||||
- linux
|
||||
- armhf
|
||||
stage: build
|
||||
script:
|
||||
- dnf install rpmdevtools dnf-plugins-core -y
|
||||
- rpmdev-setuptree
|
||||
- ./scripts/build-package-files.sh fedora/OpenRGB.spec
|
||||
- ls /root/
|
||||
- cp fedora/OpenRGB.spec /root/rpmbuild/SPECS
|
||||
- cp ../OpenRGB /root/rpmbuild/SOURCES/ -r
|
||||
- cd /root/rpmbuild/SOURCES
|
||||
- tar -cf OpenRGB.tar.gz OpenRGB/
|
||||
- cd ..
|
||||
- dnf builddep SPECS/OpenRGB.spec -y
|
||||
- rpmbuild -ba SPECS/OpenRGB.spec
|
||||
- cd RPMS/x86_64/
|
||||
- mv openrgb*.rpm ${CI_PROJECT_DIR}/
|
||||
- cd ${CI_PROJECT_DIR}
|
||||
- ./scripts/build-package-files.sh debian/changelog
|
||||
- dpkg-architecture -l
|
||||
- dpkg-buildpackage -us -B
|
||||
- rm -v ../openrgb-dbgsym*.deb
|
||||
- mv -v ../openrgb*.deb ./
|
||||
|
||||
artifacts:
|
||||
name: "${CI_PROJECT_NAME}_Linux_64_rpm_${CI_COMMIT_SHORT_SHA}"
|
||||
name: "${CI_PROJECT_NAME}_Linux_armhf_deb_${CI_COMMIT_SHORT_SHA}"
|
||||
paths:
|
||||
- openrgb*.rpm
|
||||
- openrgb*.deb
|
||||
exclude:
|
||||
- openrgb-dbgsym*.deb
|
||||
expire_in: 30 days
|
||||
|
||||
rules:
|
||||
@@ -311,10 +261,42 @@ before_script:
|
||||
allow_failure: true
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Linux (.rpm, f36) 64-bit Build Target #
|
||||
# Linux (.deb) Debian Bookworm arm64 Build Target #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Linux 64 f36 rpm":
|
||||
image: fedora:36
|
||||
"Linux arm64 .deb (Debian Bookworm)":
|
||||
<<: *ccache_init
|
||||
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-arm64
|
||||
tags:
|
||||
- linux
|
||||
- arm64
|
||||
stage: build
|
||||
script:
|
||||
- ./scripts/build-package-files.sh debian/changelog
|
||||
- dpkg-architecture -l
|
||||
- dpkg-buildpackage -us -B
|
||||
- rm -v ../openrgb-dbgsym*.deb
|
||||
- mv -v ../openrgb*.deb ./
|
||||
|
||||
artifacts:
|
||||
name: "${CI_PROJECT_NAME}_Linux_arm64_deb_${CI_COMMIT_SHORT_SHA}"
|
||||
paths:
|
||||
- openrgb*.deb
|
||||
exclude:
|
||||
- openrgb-dbgsym*.deb
|
||||
expire_in: 30 days
|
||||
|
||||
rules:
|
||||
- if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
|
||||
when: on_success
|
||||
- if: $CI_PIPELINE_SOURCE == "push"
|
||||
when: manual
|
||||
allow_failure: true
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Linux (.rpm, F40) 64-bit Build Target #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Linux 64 F40 rpm":
|
||||
image: fedora:40
|
||||
stage: build
|
||||
script:
|
||||
- dnf install rpmdevtools dnf-plugins-core libcurl-devel qt5-qtbase-devel -y
|
||||
@@ -346,73 +328,9 @@ before_script:
|
||||
allow_failure: true
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Debian 32 Buster test #
|
||||
# Debian i386 Bookworm test #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Debian 32 Buster":
|
||||
image: i386/debian:buster
|
||||
stage: test
|
||||
script:
|
||||
- apt update
|
||||
- DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*i386.deb
|
||||
- openrgb --version
|
||||
- apt remove -y openrgb
|
||||
dependencies:
|
||||
- "Linux 32 .deb (Debian Buster)"
|
||||
needs:
|
||||
- "Linux 32 .deb (Debian Buster)"
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Debian 64 Buster test #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Debian 64 Buster":
|
||||
image: amd64/debian:buster
|
||||
stage: test
|
||||
script:
|
||||
- apt update
|
||||
- DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*amd64.deb
|
||||
- openrgb --version
|
||||
- apt remove -y openrgb
|
||||
dependencies:
|
||||
- "Linux 64 .deb (Debian Buster)"
|
||||
needs:
|
||||
- "Linux 64 .deb (Debian Buster)"
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Debian 32 Bullseye test #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Debian 32 Bullseye":
|
||||
image: i386/debian:bullseye
|
||||
stage: test
|
||||
script:
|
||||
- apt update
|
||||
- DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*i386.deb
|
||||
- openrgb --version
|
||||
- apt remove -y openrgb
|
||||
dependencies:
|
||||
- "Linux 32 .deb (Debian Bullseye)"
|
||||
needs:
|
||||
- "Linux 32 .deb (Debian Bullseye)"
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Debian 64 Bullseye test #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Debian 64 Bullseye":
|
||||
image: amd64/debian:bullseye
|
||||
stage: test
|
||||
script:
|
||||
- apt update
|
||||
- DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*amd64.deb
|
||||
- openrgb --version
|
||||
- apt remove -y openrgb
|
||||
dependencies:
|
||||
- "Linux 64 .deb (Debian Bullseye)"
|
||||
needs:
|
||||
- "Linux 64 .deb (Debian Bullseye)"
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Debian 32 Bookworm test #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Debian 32 Bookworm":
|
||||
"Debian i386 Bookworm":
|
||||
image: i386/debian:bookworm
|
||||
stage: test
|
||||
script:
|
||||
@@ -421,14 +339,14 @@ before_script:
|
||||
- openrgb --version
|
||||
- apt remove -y openrgb
|
||||
dependencies:
|
||||
- "Linux 32 .deb (Debian Bookworm)"
|
||||
- "Linux i386 .deb (Debian Bookworm)"
|
||||
needs:
|
||||
- "Linux 32 .deb (Debian Bookworm)"
|
||||
- "Linux i386 .deb (Debian Bookworm)"
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Debian 64 Bookworm test #
|
||||
# Debian amd64 Bookworm test #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Debian 64 Bookworm":
|
||||
"Debian amd64 Bookworm":
|
||||
image: amd64/debian:bookworm
|
||||
stage: test
|
||||
script:
|
||||
@@ -437,30 +355,14 @@ before_script:
|
||||
- openrgb --version
|
||||
- apt remove -y openrgb
|
||||
dependencies:
|
||||
- "Linux 64 .deb (Debian Bookworm)"
|
||||
- "Linux amd64 .deb (Debian Bookworm)"
|
||||
needs:
|
||||
- "Linux 64 .deb (Debian Bookworm)"
|
||||
- "Linux amd64 .deb (Debian Bookworm)"
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Ubuntu 64 20.04LTS test #
|
||||
# Ubuntu amd64 22.04 test #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Ubuntu 64 20.04LTS":
|
||||
image: ubuntu:focal
|
||||
stage: test
|
||||
script:
|
||||
- apt update
|
||||
- DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*amd64.deb
|
||||
- openrgb --version
|
||||
- apt remove -y openrgb
|
||||
dependencies:
|
||||
- "Linux 64 .deb (Debian Buster)"
|
||||
needs:
|
||||
- "Linux 64 .deb (Debian Buster)"
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Ubuntu 64 22.04 test #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Ubuntu 64 22.04LTS":
|
||||
"Ubuntu amd64 22.04LTS":
|
||||
image: ubuntu:jammy
|
||||
stage: test
|
||||
script:
|
||||
@@ -469,39 +371,40 @@ before_script:
|
||||
- openrgb --version
|
||||
- apt remove -y openrgb
|
||||
dependencies:
|
||||
- "Linux 64 .deb (Debian Bookworm)"
|
||||
- "Linux amd64 .deb (Debian Bookworm)"
|
||||
needs:
|
||||
- "Linux 64 .deb (Debian Bookworm)"
|
||||
- "Linux amd64 .deb (Debian Bookworm)"
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Fedora 64 v35 test #
|
||||
# Ubuntu amd64 24.04 test #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Fedora 64 v35":
|
||||
image: fedora:35
|
||||
"Ubuntu amd64 24.04LTS":
|
||||
image: ubuntu:noble
|
||||
stage: test
|
||||
script:
|
||||
- apt update
|
||||
- DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*amd64.deb
|
||||
- openrgb --version
|
||||
- apt remove -y openrgb
|
||||
dependencies:
|
||||
- "Linux amd64 .deb (Debian Bookworm)"
|
||||
needs:
|
||||
- "Linux amd64 .deb (Debian Bookworm)"
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Fedora 64 v40 test #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Fedora 64 v40":
|
||||
image: fedora:40
|
||||
stage: test
|
||||
script:
|
||||
- yum -y localinstall ./openrgb*64.rpm
|
||||
- openrgb --version
|
||||
- yum -y remove openrgb
|
||||
dependencies:
|
||||
- "Linux 64 f35 rpm"
|
||||
- "Linux 64 F40 rpm"
|
||||
needs:
|
||||
- "Linux 64 f35 rpm"
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Fedora 64 v36 test #
|
||||
#-----------------------------------------------------------------------#
|
||||
"Fedora 64 v36":
|
||||
image: fedora:36
|
||||
stage: test
|
||||
script:
|
||||
- yum -y localinstall ./openrgb*64.rpm
|
||||
- openrgb --version
|
||||
- yum -y remove openrgb
|
||||
dependencies:
|
||||
- "Linux 64 f36 rpm"
|
||||
needs:
|
||||
- "Linux 64 f36 rpm"
|
||||
- "Linux 64 F40 rpm"
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Windows (32-bit) Build Target #
|
||||
|
||||
@@ -43,6 +43,7 @@ CODEOWNERS @Calcprogrammer1
|
||||
/Controllers/EVGAGP102GPUController/
|
||||
/Controllers/EVGAPascalGPUController/
|
||||
/Controllers/EVGATuringGPUController/ @TheRogueZeta
|
||||
/Controllers/EVGASMBusController/ @balika011
|
||||
/Controllers/EVGAUSBController/ @Dr_No
|
||||
/Controllers/EVisionKeyboardController/
|
||||
/Controllers/EspurnaController/
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
/*-----------------------------------------------------*\
|
||||
| OpenRGB includes |
|
||||
\*-----------------------------------------------------*/
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "Detector.h"
|
||||
#include "RGBController.h"
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "BloodyB820RController.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
/*-------------------------------------------------------------------------------------*\
|
||||
| The controller for this device should pass a packet of 64 bytes where the subsequent |
|
||||
@@ -35,14 +36,15 @@ BloodyB820RController::~BloodyB820RController()
|
||||
|
||||
std::string BloodyB820RController::GetSerial()
|
||||
{
|
||||
const int szTemp = HID_MAX_STR;
|
||||
wchar_t tmpName[szTemp];
|
||||
wchar_t serial_string[HID_MAX_STR];
|
||||
int ret = hid_get_serial_number_string(dev, serial_string, HID_MAX_STR);
|
||||
|
||||
hid_get_serial_number_string(dev, tmpName, szTemp);
|
||||
std::wstring wName = std::wstring(tmpName);
|
||||
std::string serial = std::string(wName.begin(), wName.end());
|
||||
if(ret != 0)
|
||||
{
|
||||
return("");
|
||||
}
|
||||
|
||||
return(serial);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
std::string BloodyB820RController::GetLocation()
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
#define HID_MAX_STR 255
|
||||
|
||||
@@ -145,7 +145,7 @@ static const char *led_names[] =
|
||||
@save :x:
|
||||
@direct :white_check_mark:
|
||||
@effects :x:
|
||||
@detectors A4TechDetector
|
||||
@detectors DetectBloodyB820R
|
||||
@comment The A4Tech Bloody B820R keyboard controller currently
|
||||
supports the full size (ANSI layout).
|
||||
\*-------------------------------------------------------------------*/
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "BloodyMouseController.h"
|
||||
#include "LogManager.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
BloodyMouseController::BloodyMouseController(hid_device* dev_handle, const char* path, uint16_t product_id)
|
||||
{
|
||||
@@ -33,21 +33,15 @@ uint16_t BloodyMouseController::GetPid()
|
||||
|
||||
std::string BloodyMouseController::GetSerial()
|
||||
{
|
||||
const uint8_t sz = HID_MAX_STR;
|
||||
wchar_t tmp[sz];
|
||||
wchar_t serial_string[HID_MAX_STR];
|
||||
int ret = hid_get_serial_number_string(dev, serial_string, HID_MAX_STR);
|
||||
|
||||
int ret = hid_get_serial_number_string(dev, tmp, sz);
|
||||
|
||||
if (ret != 0)
|
||||
if(ret != 0)
|
||||
{
|
||||
LOG_DEBUG("[BloodyMouse] Get HID Serial string failed");
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring w_tmp = std::wstring(tmp);
|
||||
std::string serial = std::string(w_tmp.begin(), w_tmp.end());
|
||||
|
||||
return(serial);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
std::string BloodyMouseController::GetLocation()
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
/*-----------------------------------------------------*\
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include "AMDWraithPrismController.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
AMDWraithPrismController::AMDWraithPrismController(hid_device* dev_handle, const char* path)
|
||||
{
|
||||
@@ -55,10 +56,7 @@ std::string AMDWraithPrismController::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
std::string AMDWraithPrismController::GetFirmwareVersionString()
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
#define AMD_WRAITH_PRISM_FAN_BRIGHTNESS_DEFAULT_MAX 0xFF
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "Detector.h"
|
||||
#include "AMDWraithPrismController.h"
|
||||
#include "RGBController.h"
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <cstring>
|
||||
#include <thread>
|
||||
#include "AOCKeyboardController.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
@@ -42,10 +43,7 @@ std::string AOCKeyboardController::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
void AOCKeyboardController::SetLightingConfig
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
/*-----------------------------------------*\
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
|
||||
#include <cstring>
|
||||
#include "AOCMouseController.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
AOCMouseController::AOCMouseController(hid_device* dev_handle, const char* path)
|
||||
{
|
||||
@@ -38,10 +39,7 @@ std::string AOCMouseController::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
/*-------------------------------------------------------------------------------------------------*\
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
/*-----------------------------------------*\
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
|
||||
#include <cstring>
|
||||
#include "AOCMousematController.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
AOCMousematController::AOCMousematController(hid_device* dev_handle, const char* path)
|
||||
{
|
||||
@@ -38,10 +39,7 @@ std::string AOCMousematController::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
/*-------------------------------------------------------------------------------------------------*\
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
/*-----------------------------------------*\
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
#include "RGBController.h"
|
||||
#include "ResourceManager.h"
|
||||
#include "SettingsManager.h"
|
||||
#include "StringUtils.h"
|
||||
#include "ASRockPolychromeUSBController.h"
|
||||
#include "dmiinfo.h"
|
||||
|
||||
@@ -80,10 +81,7 @@ std::string PolychromeUSBController::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
void PolychromeUSBController::SetDeviceInfo()
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
/*----------------------------------------------------------------------------------------------*\
|
||||
@@ -156,7 +156,6 @@ protected:
|
||||
);
|
||||
|
||||
private:
|
||||
unsigned int led_count;
|
||||
std::string device_name;
|
||||
unsigned char configtable[12];
|
||||
bool rgswapconfig[8] = { 0 };
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <vector>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "Detector.h"
|
||||
#include "ASRockPolychromeUSBController.h"
|
||||
#include "RGBController.h"
|
||||
|
||||
@@ -31,7 +31,6 @@ public:
|
||||
void DeviceUpdateMode();
|
||||
|
||||
private:
|
||||
bool initializedMode;
|
||||
PolychromeUSBController* controller;
|
||||
std::vector<PolychromeZoneInfo> zones_info;
|
||||
|
||||
|
||||
+1
-1
@@ -169,7 +169,7 @@ void RGBController_ASRockASRRGBSMBus::ResizeZone(int /*zone*/, int /*new_size*/)
|
||||
|
||||
void RGBController_ASRockASRRGBSMBus::DeviceUpdateLEDs()
|
||||
{
|
||||
for(int led = 0; led < colors.size(); led++)
|
||||
for(unsigned int led = 0; led < colors.size(); led++)
|
||||
{
|
||||
UpdateSingleLED(led);
|
||||
}
|
||||
|
||||
+1
-1
@@ -290,7 +290,7 @@ void RGBController_ASRockPolychromeV2SMBus::ResizeZone(int /*zone*/, int /*new_s
|
||||
|
||||
void RGBController_ASRockPolychromeV2SMBus::DeviceUpdateLEDs()
|
||||
{
|
||||
for(int led = 0; led < colors.size(); led++)
|
||||
for(unsigned int led = 0; led < colors.size(); led++)
|
||||
{
|
||||
UpdateSingleLED(led);
|
||||
}
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "RGBController.h"
|
||||
#include "AlienwareController.h"
|
||||
#include "LogManager.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
typedef uint32_t alienware_platform_id;
|
||||
|
||||
@@ -87,9 +88,7 @@ AlienwareController::AlienwareController(hid_device* dev_handle, const hid_devic
|
||||
/*-----------------------------------------------------*\
|
||||
| Get serial number |
|
||||
\*-----------------------------------------------------*/
|
||||
std::wstring tmp_serial_number;
|
||||
tmp_serial_number = info.serial_number;
|
||||
serial_number = std::string(tmp_serial_number.begin(), tmp_serial_number.end());
|
||||
serial_number = StringUtils::wstring_to_string(info.serial_number);
|
||||
|
||||
/*-----------------------------------------------------*\
|
||||
| Get zone information by checking firmware |
|
||||
@@ -654,7 +653,7 @@ void AlienwareController::UpdateDim()
|
||||
|
||||
for(size_t i = 0; i < zones.size(); i++)
|
||||
{
|
||||
dim_zone_map[zones[i].dim].emplace_back(i);
|
||||
dim_zone_map[zones[i].dim].emplace_back((uint8_t)i);
|
||||
}
|
||||
|
||||
for(std::pair<const uint8_t, std::vector<uint8_t>> &pair : dim_zone_map)
|
||||
@@ -681,7 +680,7 @@ bool AlienwareController::UpdateDirect()
|
||||
|
||||
for(size_t i = 0; i < zones.size(); i++)
|
||||
{
|
||||
color_zone_map[zones[i].color[0]].emplace_back(i);
|
||||
color_zone_map[zones[i].color[0]].emplace_back((uint8_t)i);
|
||||
}
|
||||
|
||||
for(std::pair<const RGBColor, std::vector<uint8_t>> &pair : color_zone_map)
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
/*----------------------------------------------------------------------------------------------*\
|
||||
|
||||
+3
-4
@@ -12,6 +12,7 @@
|
||||
|
||||
#include <cstring>
|
||||
#include "AlienwareAW410KController.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
AlienwareAW410KController::AlienwareAW410KController(hid_device* dev_handle, const char* path)
|
||||
{
|
||||
@@ -35,15 +36,13 @@ std::string AlienwareAW410KController::GetSerialString()
|
||||
{
|
||||
wchar_t serial_string[128];
|
||||
int ret = hid_get_serial_number_string(dev, serial_string, 128);
|
||||
|
||||
if(ret != 0)
|
||||
{
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
void AlienwareAW410KController::SendCommit()
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
enum
|
||||
|
||||
+7
-4
@@ -11,6 +11,7 @@
|
||||
|
||||
#include <cstring>
|
||||
#include "AlienwareAW510KController.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
AlienwareAW510KController::AlienwareAW510KController(hid_device* dev_handle, const char* path)
|
||||
{
|
||||
@@ -33,12 +34,14 @@ std::string AlienwareAW510KController::GetDeviceLocation()
|
||||
std::string AlienwareAW510KController::GetSerialString()
|
||||
{
|
||||
wchar_t serial_string[128];
|
||||
hid_get_serial_number_string(dev, serial_string, 128);
|
||||
int ret = hid_get_serial_number_string(dev, serial_string, 128);
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
if(ret != 0)
|
||||
{
|
||||
return("");
|
||||
}
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
void AlienwareAW510KController::SendCommit()
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
enum
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "Detector.h"
|
||||
#include "AlienwareAW510KController.h"
|
||||
#include "AlienwareAW410KController.h"
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "AnnePro2Controller.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
@@ -39,10 +40,7 @@ std::string AnnePro2Controller::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
void AnnePro2Controller::SendDirect(unsigned char frame_count, unsigned char * frame_data)
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
class AnnePro2Controller
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "AnnePro2Controller.h"
|
||||
#include "RGBController.h"
|
||||
#include "RGBController_AnnePro2.h"
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
|
||||
/*---------------------------------------------------------*\
|
||||
| Anne Pro 2 vendor IDs |
|
||||
|
||||
@@ -47,5 +47,5 @@ REGISTER_DETECTOR("Arctic RGB controller", DetectArcticControllers);
|
||||
/*---------------------------------------------------------------------------------------------------------*\
|
||||
| Entries for dynamic UDEV rules |
|
||||
| |
|
||||
| DUMMY_DEVICE_DETECTOR("Arctic RGB controller", DetectArcticControllers, 0x1a86, 0x7523 ) |
|
||||
| DUMMY_DEVICE_DETECTOR("Arctic RGB controller", DetectArcticControllers, 0x1A86, 0x7523 ) |
|
||||
\*---------------------------------------------------------------------------------------------------------*/
|
||||
|
||||
+2
-4
@@ -11,6 +11,7 @@
|
||||
|
||||
#include <cstring>
|
||||
#include "AsusAuraCoreController.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
#define AURA_CORE_MAX_MESSAGE_SIZE 64
|
||||
|
||||
@@ -49,10 +50,7 @@ std::string AuraCoreController::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
void AuraCoreController::SendBrightness
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
enum AuraCoreDeviceType
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#include "RGBController.h"
|
||||
#include "RGBController_AsusAuraCore.h"
|
||||
#include "RGBController_AsusAuraCoreLaptop.h"
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
|
||||
#define AURA_CORE_VID 0x0B05
|
||||
|
||||
|
||||
+14
-19
@@ -11,6 +11,7 @@
|
||||
|
||||
#include "AsusAuraCoreLaptopController.h"
|
||||
#include "SettingsManager.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
static uint8_t packet_map[ASUSAURACORELAPTOP_KEYCOUNT +
|
||||
ASUSAURACORELAPTOP_LIGHTBARCOUNT +
|
||||
@@ -66,19 +67,19 @@ static std::string power_states[ASUSAURACORELAPTOP_POWER_STATES] =
|
||||
|
||||
AsusAuraCoreLaptopController::AsusAuraCoreLaptopController(hid_device* dev_handle, const char* path)
|
||||
{
|
||||
const uint8_t sz = HID_MAX_STR;
|
||||
wchar_t tmp[sz];
|
||||
|
||||
dev = dev_handle;
|
||||
location = path;
|
||||
|
||||
hid_get_manufacturer_string(dev, tmp, sz);
|
||||
std::wstring wName = std::wstring(tmp);
|
||||
device_name = std::string(wName.begin(), wName.end());
|
||||
/*---------------------------------------------------------*\
|
||||
| Get device name from HID manufacturer and product strings |
|
||||
\*---------------------------------------------------------*/
|
||||
wchar_t name_string[HID_MAX_STR];
|
||||
|
||||
hid_get_product_string(dev, tmp, sz);
|
||||
wName = std::wstring(tmp);
|
||||
device_name.append(" ").append(std::string(wName.begin(), wName.end()));
|
||||
hid_get_manufacturer_string(dev, name_string, HID_MAX_STR);
|
||||
device_name = StringUtils::wstring_to_string(name_string);
|
||||
|
||||
hid_get_product_string(dev, name_string, HID_MAX_STR);
|
||||
device_name.append(" ").append(StringUtils::wstring_to_string(name_string));
|
||||
|
||||
SetPowerConfigFromJSON();
|
||||
}
|
||||
@@ -95,21 +96,15 @@ std::string AsusAuraCoreLaptopController::GetDeviceName()
|
||||
|
||||
std::string AsusAuraCoreLaptopController::GetSerial()
|
||||
{
|
||||
const uint8_t sz = HID_MAX_STR;
|
||||
wchar_t tmp[sz];
|
||||
wchar_t serial_string[128];
|
||||
int ret = hid_get_serial_number_string(dev, serial_string, 128);
|
||||
|
||||
int ret = hid_get_serial_number_string(dev, tmp, sz);
|
||||
|
||||
if (ret != 0)
|
||||
if(ret != 0)
|
||||
{
|
||||
LOG_DEBUG("[%s] Get HID Serial string failed", device_name.c_str());
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring w_tmp = std::wstring(tmp);
|
||||
std::string serial = std::string(w_tmp.begin(), w_tmp.end());
|
||||
|
||||
return serial;
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
std::string AsusAuraCoreLaptopController::GetLocation()
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "LogManager.h"
|
||||
#include "RGBController.h"
|
||||
#include "ResourceManager.h"
|
||||
|
||||
@@ -90,6 +90,7 @@ REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX 1080 Ti Gaming" , Detec
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX 1080 Ti 11G Gaming" , DetectAsusAuraGPUControllers, NVIDIA_VEN, NVIDIA_GTX1080TI_DEV, ASUS_SUB_VEN, ASUS_ROG_STRIX_GTX1080TI_11G_GAMING, 0x29);
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX 1080 Ti O11G Gaming" , DetectAsusAuraGPUControllers, NVIDIA_VEN, NVIDIA_GTX1080TI_DEV, ASUS_SUB_VEN, ASUS_ROG_STRIX_GTX1080TI_O11G_GAMING, 0x29);
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX 1080 Ti O11G Gaming" , DetectAsusAuraGPUControllers, NVIDIA_VEN, NVIDIA_GTX1080TI_DEV, ASUS_SUB_VEN, ASUS_ROG_STRIX_GTX1080TI_O11G_GAMING_A02, 0x29);
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX 1650 SUPER A4G Gaming" , DetectAsusAuraGPUControllers, NVIDIA_VEN, NVIDIA_GTX1650S_DEV, ASUS_SUB_VEN, ASUS_ROG_STRIX_GTX1650S_A4G_GAMING, 0x2A);
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX 1650 SUPER OC 4G" , DetectAsusAuraGPUControllers, NVIDIA_VEN, NVIDIA_GTX1650S_DEV, ASUS_SUB_VEN, ASUS_ROG_STRIX_GTX1650S_OC, 0x2A);
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX 1660 SUPER O6G Gaming" , DetectAsusAuraGPUControllers, NVIDIA_VEN, NVIDIA_GTX1660S_DEV, ASUS_SUB_VEN, ASUS_ROG_STRIX_GTX1660S_O6G_GAMING, 0x2A);
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG Strix GTX 1660 SUPER 6G Gaming" , DetectAsusAuraGPUControllers, NVIDIA_VEN, NVIDIA_GTX1660S_DEV, ASUS_SUB_VEN, ASUS_ROG_STRIX_GTX1660S_6G_GAMING, 0x2A);
|
||||
@@ -131,10 +132,13 @@ REGISTER_I2C_PCI_DETECTOR("ASUS ROG Vega 64 Strix" , Detec
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG RX 5600 XT Strix O6G Gaming" , DetectAsusAuraGPUControllers, AMD_GPU_VEN, AMD_NAVI10_DEV, ASUS_SUB_VEN, ASUS_RX5600XT_STRIX_O6G_GAMING, 0x2A);
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG RX 5700 XT Strix Gaming OC" , DetectAsusAuraGPUControllers, AMD_GPU_VEN, AMD_NAVI10_DEV, ASUS_SUB_VEN, ASUS_RX5700XT_STRIX_GAMING_OC, 0x2A);
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG RX 5700 XT Strix 08G Gaming" , DetectAsusAuraGPUControllers, AMD_GPU_VEN, AMD_NAVI10_DEV, ASUS_SUB_VEN, ASUS_RX5700XT_STRIX_O8G_GAMING, 0x2A);
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG RX 5700 XT Strix 08G Gaming" , DetectAsusAuraGPUControllers, AMD_GPU_VEN, AMD_NAVI10_DEV, ASUS_SUB_VEN, ASUS_RX5700XT_STRIX_O8G_GAMING_05C3, 0x2A);
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RX 470 O4G Gaming" , DetectAsusAuraGPUControllers, AMD_GPU_VEN, AMD_POLARIS_DEV, ASUS_SUB_VEN, ASUS_RX470_STRIX_O4G_GAMING, 0x29);
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RX 480 Gaming OC" , DetectAsusAuraGPUControllers, AMD_GPU_VEN, AMD_POLARIS_DEV, ASUS_SUB_VEN, ASUS_RX480_STRIX_GAMING_OC, 0x29);
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RX 560 Gaming" , DetectAsusAuraGPUControllers, AMD_GPU_VEN, AMD_POLARIS11, ASUS_SUB_VEN, ASUS_RX560_STRIX_4G_GAMING, 0x29);
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RX 560 Gaming" , DetectAsusAuraGPUControllers, AMD_GPU_VEN, AMD_POLARIS11, ASUS_SUB_VEN, ASUS_RX560_STRIX_4G_GAMING_04BE, 0x29);
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG RX 570 Strix O4G Gaming OC" , DetectAsusAuraGPUControllers, AMD_GPU_VEN, AMD_POLARIS_DEV, ASUS_SUB_VEN, ASUS_RX570_STRIX_O4G_GAMING_OC, 0x29);
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG RX 570 Strix O8G Gaming OC" , DetectAsusAuraGPUControllers, AMD_GPU_VEN, AMD_POLARIS_DEV, ASUS_SUB_VEN, ASUS_RX570_STRIX_O8G_GAMING_OC, 0x29);
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG RX 580 Strix Gaming OC" , DetectAsusAuraGPUControllers, AMD_GPU_VEN, AMD_POLARIS_DEV, ASUS_SUB_VEN, ASUS_RX580_STRIX_GAMING_OC, 0x29);
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG RX 580 Strix Gaming TOP" , DetectAsusAuraGPUControllers, AMD_GPU_VEN, AMD_POLARIS_DEV, ASUS_SUB_VEN, ASUS_RX580_STRIX_GAMING_TOP, 0x29);
|
||||
REGISTER_I2C_PCI_DETECTOR("ASUS ROG STRIX RX 590 Gaming" , DetectAsusAuraGPUControllers, AMD_GPU_VEN, AMD_POLARIS_DEV, ASUS_SUB_VEN, ASUS_RX590_STRIX_GAMING, 0x29);
|
||||
|
||||
@@ -32,7 +32,7 @@ int RGBController_AuraGPU::GetDeviceMode()
|
||||
break;
|
||||
}
|
||||
|
||||
for(int mode = 0; mode < modes.size(); mode++)
|
||||
for(unsigned int mode = 0; mode < modes.size(); mode++)
|
||||
{
|
||||
if(modes[mode].value == dev_mode)
|
||||
{
|
||||
|
||||
+2
-4
@@ -11,6 +11,7 @@
|
||||
|
||||
#include <cstring>
|
||||
#include "AsusAuraHeadsetStandController.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
AuraHeadsetStandController::AuraHeadsetStandController(hid_device* dev_handle, const char* path)
|
||||
{
|
||||
@@ -38,10 +39,7 @@ std::string AuraHeadsetStandController::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
std::string AuraHeadsetStandController::GetVersion()
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
enum
|
||||
|
||||
+2
-4
@@ -11,6 +11,7 @@
|
||||
|
||||
#include <cstring>
|
||||
#include "AsusAuraKeyboardController.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
AuraKeyboardController::AuraKeyboardController(hid_device* dev_handle, const char* path)
|
||||
{
|
||||
@@ -38,10 +39,7 @@ std::string AuraKeyboardController::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
void AuraKeyboardController::SendDirect
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
class AuraKeyboardController
|
||||
|
||||
+2
-4
@@ -12,6 +12,7 @@
|
||||
#include <cstring>
|
||||
#include "AsusAuraMonitorController.h"
|
||||
#include "LogManager.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
AuraMonitorController::AuraMonitorController(hid_device* dev_handle, const char* path, uint16_t pid)
|
||||
{
|
||||
@@ -40,10 +41,7 @@ std::string AuraMonitorController::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
void AuraMonitorController::BeginUpdate()
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
enum
|
||||
|
||||
+2
-2
@@ -13,7 +13,7 @@
|
||||
|
||||
/**------------------------------------------------------------------*\
|
||||
@name Asus Aura Monitor
|
||||
@category LEDStrip
|
||||
@category Accessory
|
||||
@type USB
|
||||
@save :x:
|
||||
@direct :white_check_mark:
|
||||
@@ -28,7 +28,7 @@ RGBController_AuraMonitor::RGBController_AuraMonitor(AuraMonitorController* cont
|
||||
|
||||
name = "ASUS Aura Monitor";
|
||||
vendor = "ASUS";
|
||||
type = DEVICE_TYPE_LEDSTRIP;
|
||||
type = DEVICE_TYPE_ACCESSORY;
|
||||
description = "ASUS Aura Monitor Device";
|
||||
location = controller->GetDeviceLocation();
|
||||
serial = controller->GetSerialString();
|
||||
|
||||
+2
-4
@@ -11,6 +11,7 @@
|
||||
|
||||
#include <cstring>
|
||||
#include "AsusAuraMouseController.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
AuraMouseController::AuraMouseController(hid_device* dev_handle, const char* path, uint16_t pid)
|
||||
{
|
||||
@@ -65,10 +66,7 @@ std::string AuraMouseController::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring serial_wstring = serial_string;
|
||||
std::string return_string = CleanSerial(serial_wstring);
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
std::string AuraMouseController::GetVersion(bool wireless, int protocol)
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
#include "AsusAuraMouseDevices.h"
|
||||
|
||||
|
||||
+2
-4
@@ -13,6 +13,7 @@
|
||||
#include <chrono>
|
||||
#include <thread>
|
||||
#include "AsusAuraMouseGen1Controller.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
AsusAuraMouseGen1Controller::AsusAuraMouseGen1Controller(hid_device* dev_handle, const char* path, uint16_t pid)
|
||||
{
|
||||
@@ -41,10 +42,7 @@ std::string AsusAuraMouseGen1Controller::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
std::string AsusAuraMouseGen1Controller::GetVersion()
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
#define HID_MAX_STR 255
|
||||
|
||||
+2
-2
@@ -221,7 +221,7 @@ void RGBController_AsusROGSpatha::DeviceUpdateMode()
|
||||
|
||||
if(modes[active_mode].value == ASUS_ROG_SPATHA_MODE_SPECTRUM_CYCLE || modes[active_mode].value == ASUS_ROG_SPATHA_MODE_BREATHING)
|
||||
{
|
||||
for(int j = 0; j < modes[active_mode].colors.size(); j++)
|
||||
for(unsigned int j = 0; j < modes[active_mode].colors.size(); j++)
|
||||
{
|
||||
controller->SendUpdate(0x13 + j * 3 + i * 38, RGBGetRValue(modes[active_mode].colors[j]));
|
||||
controller->SendUpdate(0x14 + j * 3 + i * 38, RGBGetGValue(modes[active_mode].colors[j]));
|
||||
@@ -255,7 +255,7 @@ void RGBController_AsusROGSpatha::DeviceSaveMode()
|
||||
|
||||
if(modes[active_mode].value == ASUS_ROG_SPATHA_MODE_SPECTRUM_CYCLE || modes[active_mode].value == ASUS_ROG_SPATHA_MODE_BREATHING)
|
||||
{
|
||||
for(int j = 0; j < modes[active_mode].colors.size(); j++)
|
||||
for(unsigned int j = 0; j < modes[active_mode].colors.size(); j++)
|
||||
{
|
||||
controller->UpdateProfile(0x13 + j * 3 + i * 38, profile, RGBGetRValue(modes[active_mode].colors[j]));
|
||||
controller->UpdateProfile(0x14 + j * 3 + i * 38, profile, RGBGetGValue(modes[active_mode].colors[j]));
|
||||
|
||||
+13
-13
@@ -1,14 +1,17 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusAuraMousematController.cpp |
|
||||
| |
|
||||
| Driver for ASUS Aura RGB USB |
|
||||
| lighting controller |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 1/10/2022 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusAuraMousematController.cpp |
|
||||
| |
|
||||
| Driver for ASUS Aura mousemat |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 10 Jan 2022 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "AsusAuraMousematController.h"
|
||||
#include <cstring>
|
||||
#include "AsusAuraMousematController.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
AuraMousematController::AuraMousematController(hid_device* dev_handle, const char* path)
|
||||
{
|
||||
@@ -36,10 +39,7 @@ std::string AuraMousematController::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
std::string AuraMousematController::GetVersion()
|
||||
|
||||
+12
-11
@@ -1,17 +1,18 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusAuraMousematController.h |
|
||||
| |
|
||||
| Definitions and types for ASUS Aura |
|
||||
| USB RGB lighting controller |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 1/10/2022 |
|
||||
\*-----------------------------------------*/
|
||||
|
||||
#include "RGBController.h"
|
||||
#include <hidapi/hidapi.h>
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusAuraMousematController.h |
|
||||
| |
|
||||
| Driver for ASUS Aura mousemat |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 10 Jan 2022 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
enum
|
||||
{
|
||||
|
||||
+10
-8
@@ -1,11 +1,13 @@
|
||||
/*-----------------------------------------*\
|
||||
| RGBController_AsusAuraMousemat.cpp |
|
||||
| |
|
||||
| Generic RGB Interface for Asus Aura |
|
||||
| USB controller driver |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 1/10/2022 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusAuraMousemat.cpp |
|
||||
| |
|
||||
| RGBController for ASUS Aura mousemat |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 10 Jan 2022 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "RGBController_AsusAuraMousemat.h"
|
||||
|
||||
|
||||
+11
-8
@@ -1,13 +1,16 @@
|
||||
/*-----------------------------------------*\
|
||||
| RGBController_AsusAuraMousemat.h |
|
||||
| |
|
||||
| Generic RGB Interface for Asus Aura |
|
||||
| USB controller driver |
|
||||
| |
|
||||
| Mola19 06/04/2021 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusAuraMousemat.h |
|
||||
| |
|
||||
| RGBController for ASUS Aura mousemat |
|
||||
| |
|
||||
| Mola19 06 Apr 2021 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "RGBController.h"
|
||||
#include "AsusAuraMousematController.h"
|
||||
|
||||
|
||||
+11
-9
@@ -1,12 +1,14 @@
|
||||
/*-------------------------------------------------------------------*\
|
||||
| AsusAuraRyuoAIOController.cpp |
|
||||
| |
|
||||
| Driver for the ASUS Aura Ryuo AIO |
|
||||
| lighting controller |
|
||||
| |
|
||||
| Cooper Hall (geobot19 / Geo_bot) 08 Apr 2022 |
|
||||
| using snipets from Chris M (Dr.No) |
|
||||
\*-------------------------------------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusAuraRyuoAIOController.cpp |
|
||||
| |
|
||||
| Driver for ASUS Aura Ryuo |
|
||||
| |
|
||||
| Cooper Hall (geobot19 / Geo_bot) 08 Apr 2022 |
|
||||
| using snipets from Chris M (Dr.No) |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "AsusAuraRyuoAIOController.h"
|
||||
|
||||
|
||||
+16
-14
@@ -1,20 +1,22 @@
|
||||
/*-------------------------------------------------------------------*\
|
||||
| AsusAuraRyuoAIOController.h |
|
||||
| |
|
||||
| Driver for the ASUS Aura Ryuo AIO |
|
||||
| lighting controller |
|
||||
| |
|
||||
| Cooper Hall (geobot19 / Geo_bot) 08 Apr 2022 |
|
||||
| using snipets from Chris M (Dr.No) |
|
||||
\*-------------------------------------------------------------------*/
|
||||
|
||||
#include <string>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include "RGBController.h"
|
||||
#include "AsusAuraUSBController.h"
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusAuraRyuoAIOController.h |
|
||||
| |
|
||||
| Driver for ASUS Aura Ryuo |
|
||||
| |
|
||||
| Cooper Hall (geobot19 / Geo_bot) 08 Apr 2022 |
|
||||
| using snipets from Chris M (Dr.No) |
|
||||
| |
|
||||
| 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"
|
||||
#include "AsusAuraUSBController.h"
|
||||
|
||||
#define ASUSAURARYUOAIOCONTROLLER_TIMEOUT 250
|
||||
#define ASUSAURARYUOAIOCONTROLLER_HID_MAX_STR 255
|
||||
|
||||
|
||||
+13
-11
@@ -1,12 +1,14 @@
|
||||
/*-------------------------------------------------------------------*\
|
||||
| RGBController_AsusAuraRyuoAIO.cpp |
|
||||
| |
|
||||
| Driver for the ASUS Aura Ryuo AIO |
|
||||
| lighting controller |
|
||||
| |
|
||||
| Cooper Hall (geobot19 / Geo_bot) 08 Apr 2022 |
|
||||
| using snipets from Chris M (Dr.No) |
|
||||
\*-------------------------------------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusAuraRyuoAIO.cpp |
|
||||
| |
|
||||
| RGBController for ASUS Aura Ryuo |
|
||||
| |
|
||||
| Cooper Hall (geobot19 / Geo_bot) 08 Apr 2022 |
|
||||
| using snipets from Chris M (Dr.No) |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "RGBControllerKeyNames.h"
|
||||
#include "RGBController_AsusAuraRyuoAIO.h"
|
||||
@@ -178,7 +180,7 @@ void RGBController_AsusAuraRyuoAIO::ResizeZone(int /*zone*/, int /*new_size*/)
|
||||
|
||||
void RGBController_AsusAuraRyuoAIO::DeviceUpdateLEDs()
|
||||
{
|
||||
for(int zone_idx = 0; zone_idx < zones.size(); zone_idx++)
|
||||
for(unsigned int zone_idx = 0; zone_idx < zones.size(); zone_idx++)
|
||||
{
|
||||
UpdateZoneLEDs(zone_idx);
|
||||
}
|
||||
@@ -203,7 +205,7 @@ void RGBController_AsusAuraRyuoAIO::DeviceUpdateMode()
|
||||
|
||||
int RGBController_AsusAuraRyuoAIO::GetLED_Zone(int led_idx)
|
||||
{
|
||||
for(int zone_idx = 0; zone_idx < zones.size(); zone_idx++)
|
||||
for(unsigned int zone_idx = 0; zone_idx < zones.size(); zone_idx++)
|
||||
{
|
||||
int zone_start = zones[zone_idx].start_idx;
|
||||
int zone_end = zone_start + zones[zone_idx].leds_count - 1;
|
||||
|
||||
+13
-10
@@ -1,18 +1,21 @@
|
||||
/*-------------------------------------------------------------------*\
|
||||
| RGBController_AsusAuraRyuoAIO.h |
|
||||
| |
|
||||
| Driver for the ASUS Aura Ryuo AIO |
|
||||
| lighting controller |
|
||||
| |
|
||||
| Cooper Hall (geobot19 / Geo_bot) 08 Apr 2022 |
|
||||
| using snipets from Chris M (Dr.No) |
|
||||
\*-------------------------------------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusAuraRyuoAIO.h |
|
||||
| |
|
||||
| RGBController for ASUS Aura Ryuo |
|
||||
| |
|
||||
| Cooper Hall (geobot19 / Geo_bot) 08 Apr 2022 |
|
||||
| using snipets from Chris M (Dr.No) |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <vector>
|
||||
#include "LogManager.h"
|
||||
#include "RGBController.h"
|
||||
#include "AsusAuraRyuoAIOController.h"
|
||||
#include <vector>
|
||||
|
||||
class RGBController_AsusAuraRyuoAIO : public RGBController
|
||||
{
|
||||
|
||||
+16
-17
@@ -1,21 +1,23 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusAuraTUFKeyboardController.cpp |
|
||||
| |
|
||||
| Driver for ASUS Aura RGB USB |
|
||||
| lighting controller |
|
||||
| |
|
||||
| Mola19 03/03/2021 |
|
||||
\*-----------------------------------------*/
|
||||
|
||||
#include "AsusAuraTUFKeyboardController.h"
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusAuraTUFKeyboardController.cpp |
|
||||
| |
|
||||
| Driver for ASUS Aura TUF keyboard |
|
||||
| |
|
||||
| Mola19 03 Mar 2021 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include <cmath>
|
||||
#include <cstring>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <math.h>
|
||||
#include <string>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <cmath>
|
||||
#include <vector>
|
||||
#include "AsusAuraTUFKeyboardController.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
AuraTUFKeyboardController::AuraTUFKeyboardController(hid_device* dev_handle, const char* path, uint16_t pid, unsigned short version)
|
||||
{
|
||||
@@ -69,10 +71,7 @@ std::string AuraTUFKeyboardController::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring serial_wstring = serial_string;
|
||||
std::string return_string = clean_serial(serial_wstring);
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
std::string AuraTUFKeyboardController::GetVersion()
|
||||
|
||||
+14
-13
@@ -1,20 +1,21 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusAuraTUFKeyboardController.h |
|
||||
| |
|
||||
| Definitions and types for ASUS Aura |
|
||||
| USB RGB lighting controller |
|
||||
| |
|
||||
| Mola19 03/03/2021 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusAuraTUFKeyboardController.h |
|
||||
| |
|
||||
| Driver for ASUS Aura TUF keyboard |
|
||||
| |
|
||||
| Mola19 03 Mar 2021 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "RGBController.h"
|
||||
#include "AsusAuraTUFKeyboardLayouts.h"
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <hidapi/hidapi.h>
|
||||
|
||||
#pragma once
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
#include "AsusAuraTUFKeyboardLayouts.h"
|
||||
|
||||
enum
|
||||
{
|
||||
|
||||
+15
-13
@@ -1,19 +1,21 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusAuraTUFKeyboardController.h |
|
||||
| |
|
||||
| Definitions and types for ASUS Aura |
|
||||
| USB RGB lighting controller |
|
||||
| |
|
||||
| Mola19 10/02/2021 |
|
||||
\*-----------------------------------------*/
|
||||
|
||||
#include "RGBControllerKeyNames.h"
|
||||
#include <vector>
|
||||
#include <map>
|
||||
#include "RGBController.h"
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusAuraTUFKeyboardLayouts.h |
|
||||
| |
|
||||
| Layouts for ASUS Aura TUF keyboard |
|
||||
| |
|
||||
| Mola19 02 Nov 2021 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <map>
|
||||
#include <vector>
|
||||
#include "RGBControllerKeyNames.h"
|
||||
#include "RGBController.h"
|
||||
|
||||
enum
|
||||
{
|
||||
ASUS_TUF_K7_LAYOUT_CA = 1,
|
||||
|
||||
+13
-11
@@ -1,15 +1,17 @@
|
||||
/*-----------------------------------------*\
|
||||
| RGBController_AsusAuraTUFKeyboard.cpp |
|
||||
| |
|
||||
| Generic RGB Interface for Asus Aura |
|
||||
| USB controller driver |
|
||||
| |
|
||||
| Mola19 03/03/2020 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusAuraTUFKeyboard.cpp |
|
||||
| |
|
||||
| RGBController for ASUS Aura TUF keyboard |
|
||||
| |
|
||||
| Mola19 03 Mar 2021 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "RGBController_AsusAuraTUFKeyboard.h"
|
||||
#include <vector>
|
||||
#include <cmath>
|
||||
#include <vector>
|
||||
#include "RGBController_AsusAuraTUFKeyboard.h"
|
||||
|
||||
/**------------------------------------------------------------------*\
|
||||
@name Asus Aura TUF Keyboard
|
||||
@@ -138,7 +140,7 @@ RGBController_AuraTUFKeyboard::RGBController_AuraTUFKeyboard(AuraTUFKeyboardCont
|
||||
Wave.value = AURA_KEYBOARD_MODE_WAVE;
|
||||
Wave.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_DIRECTION_HV | MODE_FLAG_MANUAL_SAVE | MODE_FLAG_HAS_BRIGHTNESS;
|
||||
if(controller->is_per_led_keyboard) Wave.flags |= MODE_FLAG_HAS_DIRECTION_UD;
|
||||
|
||||
|
||||
Wave.speed_min = AURA_KEYBOARD_SPEED_MIN;
|
||||
Wave.speed_max = AURA_KEYBOARD_SPEED_MAX;
|
||||
Wave.speed = AURA_KEYBOARD_SPEED_DEFAULT;
|
||||
|
||||
+11
-8
@@ -1,13 +1,16 @@
|
||||
/*-----------------------------------------*\
|
||||
| RGBController_AsusAuraTUFKeyboard.h |
|
||||
| |
|
||||
| Generic RGB Interface for Asus Aura |
|
||||
| USB controller driver |
|
||||
| |
|
||||
| Mola19 03/03/2021 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusAuraTUFKeyboard.h |
|
||||
| |
|
||||
| RGBController for ASUS Aura TUF keyboard |
|
||||
| |
|
||||
| Mola19 03 Mar 2021 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "RGBController.h"
|
||||
#include "AsusAuraTUFKeyboardController.h"
|
||||
|
||||
|
||||
+11
-9
@@ -1,14 +1,16 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusAuraAddressableController.cpp |
|
||||
| |
|
||||
| Driver for ASUS Aura RGB Addressable |
|
||||
| lighting controller |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 1/18/2020 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusAuraAddressableController.cpp |
|
||||
| |
|
||||
| Driver for ASUS Aura addressable controller |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 18 Jan 2020 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "AsusAuraAddressableController.h"
|
||||
#include <cstring>
|
||||
#include "AsusAuraAddressableController.h"
|
||||
|
||||
AuraAddressableController::AuraAddressableController(hid_device* dev_handle, const char* path) : AuraUSBController(dev_handle, path)
|
||||
{
|
||||
|
||||
+15
-14
@@ -1,20 +1,21 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusAuraAddressableController.h |
|
||||
| |
|
||||
| Definitions and types for ASUS Aura |
|
||||
| Addressable RGB lighting controller |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 1/18/2020 |
|
||||
\*-----------------------------------------*/
|
||||
|
||||
#include "RGBController.h"
|
||||
#include "AsusAuraUSBController.h"
|
||||
|
||||
#include <string>
|
||||
#include <hidapi/hidapi.h>
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusAuraAddressableController.h |
|
||||
| |
|
||||
| Driver for ASUS Aura addressable controller |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 18 Jan 2020 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
#include "AsusAuraUSBController.h"
|
||||
|
||||
enum
|
||||
{
|
||||
AURA_ADDRESSABLE_CONTROL_MODE_EFFECT = 0x3B, /* Effect control mode */
|
||||
|
||||
+11
-9
@@ -1,14 +1,16 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusAuraMainboardController.cpp |
|
||||
| |
|
||||
| Driver for ASUS Aura RGB USB mainboard |
|
||||
| lighting controller |
|
||||
| |
|
||||
| Martin Hartl (inlart) 4/25/2020 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusAuraMainboardController.cpp |
|
||||
| |
|
||||
| Driver for ASUS Aura mainboard |
|
||||
| |
|
||||
| Martin Hartl (inlart) 25 Apr 2020 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "AsusAuraMainboardController.h"
|
||||
#include <cstring>
|
||||
#include "AsusAuraMainboardController.h"
|
||||
|
||||
AuraMainboardController::AuraMainboardController(hid_device* dev_handle, const char* path) : AuraUSBController(dev_handle, path), mode(AURA_MODE_DIRECT)
|
||||
{
|
||||
|
||||
+15
-14
@@ -1,20 +1,21 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusAuraMainboardController.h |
|
||||
| |
|
||||
| Definitions and types for ASUS Aura |
|
||||
| USB Mainboard RGB lighting controller |
|
||||
| |
|
||||
| Martin Hartl (inlart) 4/25/2020 |
|
||||
\*-----------------------------------------*/
|
||||
|
||||
#include "RGBController.h"
|
||||
#include "AsusAuraUSBController.h"
|
||||
|
||||
#include <string>
|
||||
#include <hidapi/hidapi.h>
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusAuraMainboardController.h |
|
||||
| |
|
||||
| Driver for ASUS Aura mainboard |
|
||||
| |
|
||||
| Martin Hartl (inlart) 25 Apr 2020 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
#include "AsusAuraUSBController.h"
|
||||
|
||||
enum
|
||||
{
|
||||
AURA_MAINBOARD_CONTROL_MODE_EFFECT = 0x35, /* Effect control mode */
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusAuraUSBController.cpp |
|
||||
| |
|
||||
| Driver for ASUS Aura RGB USB |
|
||||
| lighting controller |
|
||||
| |
|
||||
| Martin Hartl (inlart) 4/25/2020 |
|
||||
\*-----------------------------------------*/
|
||||
|
||||
#include "AsusAuraUSBController.h"
|
||||
#include "LogManager.h"
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusAuraUSBController.cpp |
|
||||
| |
|
||||
| Driver for ASUS Aura USB device |
|
||||
| |
|
||||
| Martin Hartl (inlart) 25 Apr 2020 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include <cstring>
|
||||
#include "AsusAuraUSBController.h"
|
||||
#include "LogManager.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
AuraUSBController::AuraUSBController(hid_device* dev_handle, const char* path)
|
||||
{
|
||||
@@ -51,10 +53,7 @@ std::string AuraUSBController::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
const std::vector<AuraDeviceInfo>& AuraUSBController::GetAuraDevices() const
|
||||
|
||||
@@ -1,20 +1,21 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusAuraUSBController.h |
|
||||
| |
|
||||
| Definitions and types for ASUS Aura |
|
||||
| USB RGB lighting controller |
|
||||
| |
|
||||
| Martin Hartl (inlart) 4/25/2020 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusAuraUSBController.h |
|
||||
| |
|
||||
| Driver for ASUS Aura USB device |
|
||||
| |
|
||||
| Martin Hartl (inlart) 25 Apr 2020 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "RGBController.h"
|
||||
#include "LogManager.h"
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <hidapi/hidapi.h>
|
||||
|
||||
#pragma once
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
#include "LogManager.h"
|
||||
|
||||
enum
|
||||
{
|
||||
@@ -104,7 +105,6 @@ protected:
|
||||
);
|
||||
private:
|
||||
char device_name[16];
|
||||
unsigned int led_count;
|
||||
|
||||
void GetConfigTable();
|
||||
|
||||
|
||||
+10
-10
@@ -1,13 +1,13 @@
|
||||
/*-----------------------------------------*\
|
||||
| RGBController_AsusAuraMainboard.cpp |
|
||||
| |
|
||||
| RGB controller for Asus Aura USB |
|
||||
| mainboards |
|
||||
| |
|
||||
| rytypete 8/30/2023 |
|
||||
| based on RGBController_AsusAuraUSB.cpp |
|
||||
| code |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusAuraMainboard.cpp |
|
||||
| |
|
||||
| RGBController for ASUS Aura mainboard |
|
||||
| |
|
||||
| rytypete 30 Aug 2023 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "RGBController_AsusAuraMainboard.h"
|
||||
|
||||
|
||||
+11
-10
@@ -1,15 +1,16 @@
|
||||
/*-----------------------------------------*\
|
||||
| RGBController_AsusAuraMainboard.h |
|
||||
| |
|
||||
| RGB controller for Asus Aura USB |
|
||||
| mainboards |
|
||||
| |
|
||||
| rytypete 8/30/2023 |
|
||||
| based on RGBController_AsusAuraUSB.h |
|
||||
| code |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusAuraMainboard.h |
|
||||
| |
|
||||
| RGBController for ASUS Aura mainboard |
|
||||
| |
|
||||
| rytypete 30 Aug 2023 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "RGBController_AsusAuraUSB.h"
|
||||
#include "AsusAuraMainboardController.h"
|
||||
|
||||
|
||||
+10
-8
@@ -1,11 +1,13 @@
|
||||
/*-----------------------------------------*\
|
||||
| RGBController_AsusAuraUSB.cpp |
|
||||
| |
|
||||
| Generic RGB Interface for Asus Aura |
|
||||
| USB controller driver |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 1/18/2020 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusAuraUSB.cpp |
|
||||
| |
|
||||
| RGBController for ASUS Aura USB device |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 18 Jan 2020 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "RGBController_AsusAuraUSB.h"
|
||||
|
||||
|
||||
+11
-8
@@ -1,13 +1,16 @@
|
||||
/*-----------------------------------------*\
|
||||
| RGBController_AsusAuraUSB.h |
|
||||
| |
|
||||
| Generic RGB Interface for Asus Aura |
|
||||
| USB controller driver |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 1/18/2020 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusAuraUSB.h |
|
||||
| |
|
||||
| RGBController for ASUS Aura USB device |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 18 Jan 2020 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "RGBController.h"
|
||||
#include "AsusAuraUSBController.h"
|
||||
|
||||
|
||||
@@ -1,3 +1,14 @@
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusAuraUSBControllerDetect.cpp |
|
||||
| |
|
||||
| Detector for ASUS Aura USB devices |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include <stdexcept>
|
||||
#include <hidapi.h>
|
||||
#include "Detector.h"
|
||||
#include "AsusAuraAddressableController.h"
|
||||
#include "AsusAuraHeadsetStandController.h"
|
||||
@@ -25,8 +36,6 @@
|
||||
#include "RGBController_AsusROGStrixEvolve.h"
|
||||
#include "RGBController_AsusAuraMonitor.h"
|
||||
#include "RGBController_AsusAuraRyuoAIO.h"
|
||||
#include <stdexcept>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include "dmiinfo.h"
|
||||
|
||||
#define AURA_USB_VID 0x0B05
|
||||
|
||||
@@ -1,14 +1,17 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusROGAllyController.cpp |
|
||||
| |
|
||||
| Driver for ASUS ROG Ally lighting |
|
||||
| controller |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 6/12/2023 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusROGAllyController.cpp |
|
||||
| |
|
||||
| Driver for ASUS ROG Ally |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 12 Jul 2023 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "AsusROGAllyController.h"
|
||||
#include <cstring>
|
||||
#include "AsusROGAllyController.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
ROGAllyController::ROGAllyController(hid_device* dev_handle, const char* path)
|
||||
{
|
||||
@@ -38,10 +41,7 @@ std::string ROGAllyController::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
std::string ROGAllyController::GetVersion()
|
||||
@@ -57,7 +57,7 @@ void ROGAllyController::SendInitialization()
|
||||
|
||||
usb_buf[0x00] = 0x5D;
|
||||
usb_buf[0x01] = 0xB9;
|
||||
|
||||
|
||||
hid_send_feature_report(dev, usb_buf, sizeof(usb_buf));
|
||||
|
||||
memset(usb_buf, 0x00, sizeof(usb_buf));
|
||||
@@ -77,7 +77,7 @@ void ROGAllyController::SendInitialization()
|
||||
usb_buf[0x0C] = 0x6E;
|
||||
usb_buf[0x0D] = 0x63;
|
||||
usb_buf[0x0E] = 0x2E;
|
||||
|
||||
|
||||
hid_send_feature_report(dev, usb_buf, sizeof(usb_buf));
|
||||
}
|
||||
|
||||
@@ -175,4 +175,3 @@ void ROGAllyController::SaveMode()
|
||||
|
||||
hid_send_feature_report(dev, usb_buf, sizeof(usb_buf));
|
||||
}
|
||||
|
||||
|
||||
@@ -1,17 +1,19 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusROGAllyController.h |
|
||||
| |
|
||||
| Definitions and types for ASUS ROG Ally |
|
||||
| lighting controller |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 6/12/2023 |
|
||||
\*-----------------------------------------*/
|
||||
|
||||
#include "RGBController.h"
|
||||
#include <hidapi/hidapi.h>
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusROGAllyController.h |
|
||||
| |
|
||||
| Driver for ASUS ROG Ally |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 12 Jul 2023 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
enum
|
||||
{
|
||||
ROG_ALLY_MODE_STATIC = 0,
|
||||
@@ -46,7 +48,7 @@ public:
|
||||
std::string GetVersion();
|
||||
|
||||
void SendInitialization();
|
||||
|
||||
|
||||
void UpdateBrightness
|
||||
(
|
||||
unsigned char brightness
|
||||
|
||||
+10
-8
@@ -1,11 +1,13 @@
|
||||
/*-----------------------------------------*\
|
||||
| RGBController_AsusROGAlly.cpp |
|
||||
| |
|
||||
| Generic RGB Interface for Asus ROG Ally |
|
||||
| controller driver |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 6/12/2023 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusROGAlly.cpp |
|
||||
| |
|
||||
| RGBController for ASUS ROG Ally |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 12 Jul 2023 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "RGBController_AsusROGAlly.h"
|
||||
|
||||
|
||||
+10
-8
@@ -1,11 +1,13 @@
|
||||
/*-----------------------------------------*\
|
||||
| RGBController_AsusROGAlly.cpp |
|
||||
| |
|
||||
| Generic RGB Interface for Asus ROG Ally |
|
||||
| controller driver |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 6/12/2023 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusROGAlly.h |
|
||||
| |
|
||||
| RGBController for ASUS ROG Ally |
|
||||
| |
|
||||
| Adam Honse (CalcProgrammer1) 12 Jul 2023 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
+10
-9
@@ -1,12 +1,13 @@
|
||||
/*-------------------------------------------------------------------*\
|
||||
| AsusROGStrixLCController.cpp |
|
||||
| |
|
||||
| Driver for the ASUS Aura Liquid Cooler (LC) series |
|
||||
| of lighting controllers |
|
||||
| |
|
||||
| Chris M (Dr_No) 17 Jan 2022 |
|
||||
| |
|
||||
\*-------------------------------------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusROGStrixLCController.cpp |
|
||||
| |
|
||||
| Driver for ASUS Aura liquid cooler |
|
||||
| |
|
||||
| Chris M (Dr_No) 17 Jan 2022 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "AsusROGStrixLCController.h"
|
||||
|
||||
|
||||
+15
-14
@@ -1,20 +1,21 @@
|
||||
/*-------------------------------------------------------------------*\
|
||||
| AsusROGStrixLCController.h |
|
||||
| |
|
||||
| Driver for the ASUS Aura Liquid Cooler (LC) series |
|
||||
| of lighting controllers |
|
||||
| |
|
||||
| Chris M (Dr_No) 17 Jan 2022 |
|
||||
| |
|
||||
\*-------------------------------------------------------------------*/
|
||||
|
||||
#include <string>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include "RGBController.h"
|
||||
#include "AsusAuraUSBController.h"
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusROGStrixLCController.h |
|
||||
| |
|
||||
| Driver for ASUS Aura liquid cooler |
|
||||
| |
|
||||
| Chris M (Dr_No) 17 Jan 2022 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
#include "AsusAuraUSBController.h"
|
||||
|
||||
#define ROGSTRIXLC_CONTROLLER_TIMEOUT 250
|
||||
#define HID_MAX_STR 255
|
||||
|
||||
|
||||
+12
-11
@@ -1,12 +1,13 @@
|
||||
/*-------------------------------------------------------------------*\
|
||||
| RGBController_AsusROGStrixLC.cpp |
|
||||
| |
|
||||
| Driver for the ASUS Aura Liquid Cooler (LC) series |
|
||||
| of lighting controllers |
|
||||
| |
|
||||
| Chris M (Dr_No) 17 Jan 2022 |
|
||||
| |
|
||||
\*-------------------------------------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusROGStrixLC.cpp |
|
||||
| |
|
||||
| RGBController for ASUS Aura liquid cooler |
|
||||
| |
|
||||
| Chris M (Dr_No) 17 Jan 2022 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "RGBControllerKeyNames.h"
|
||||
#include "RGBController_AsusROGStrixLC.h"
|
||||
@@ -180,7 +181,7 @@ void RGBController_AsusROGStrixLC::ResizeZone(int /*zone*/, int /*new_size*/)
|
||||
|
||||
void RGBController_AsusROGStrixLC::DeviceUpdateLEDs()
|
||||
{
|
||||
for(int zone_idx = 0; zone_idx < zones.size(); zone_idx++)
|
||||
for(unsigned int zone_idx = 0; zone_idx < zones.size(); zone_idx++)
|
||||
{
|
||||
UpdateZoneLEDs(zone_idx);
|
||||
}
|
||||
@@ -205,7 +206,7 @@ void RGBController_AsusROGStrixLC::DeviceUpdateMode()
|
||||
|
||||
int RGBController_AsusROGStrixLC::GetLED_Zone(int led_idx)
|
||||
{
|
||||
for(int zone_idx = 0; zone_idx < zones.size(); zone_idx++)
|
||||
for(unsigned int zone_idx = 0; zone_idx < zones.size(); zone_idx++)
|
||||
{
|
||||
int zone_start = zones[zone_idx].start_idx;
|
||||
int zone_end = zone_start + zones[zone_idx].leds_count - 1;
|
||||
|
||||
+12
-10
@@ -1,18 +1,20 @@
|
||||
/*-------------------------------------------------------------------*\
|
||||
| RGBController_AsusROGStrixLC.h |
|
||||
| |
|
||||
| Driver for the ASUS Aura Liquid Cooler (LC) series |
|
||||
| of lighting controllers |
|
||||
| |
|
||||
| Chris M (Dr_No) 17 Jan 2022 |
|
||||
| |
|
||||
\*-------------------------------------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusROGStrixLC.h |
|
||||
| |
|
||||
| RGBController for ASUS Aura liquid cooler |
|
||||
| |
|
||||
| Chris M (Dr_No) 17 Jan 2022 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <vector>
|
||||
#include "LogManager.h"
|
||||
#include "RGBController.h"
|
||||
#include "AsusROGStrixLCController.h"
|
||||
#include <vector>
|
||||
|
||||
class RGBController_AsusROGStrixLC : public RGBController
|
||||
{
|
||||
|
||||
+12
-12
@@ -1,11 +1,13 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusCerberusKeyboardController.cpp |
|
||||
| |
|
||||
| Driver for ASUS Cerberus USB lighting |
|
||||
| controller |
|
||||
| |
|
||||
| Mola19 05/28/2022 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusCerberusKeyboardController.cpp |
|
||||
| |
|
||||
| Driver for ASUS Cerberus keyboard |
|
||||
| |
|
||||
| Mola19 28 May 2022 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include <cmath>
|
||||
#include <cstring>
|
||||
@@ -15,6 +17,7 @@
|
||||
#include <string.h>
|
||||
#include <vector>
|
||||
#include "AsusCerberusKeyboardController.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
#define ASUS_CERBERUS_KB_PACKET_SIZE 8
|
||||
|
||||
@@ -45,10 +48,7 @@ std::string AsusCerberusKeyboardController::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
std::string AsusCerberusKeyboardController::GetVersion()
|
||||
|
||||
+11
-10
@@ -1,17 +1,19 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusCerberusKeyboardController.h |
|
||||
| |
|
||||
| Definitions and types for ASUS Cerberus |
|
||||
| USB RGB lighting controller |
|
||||
| |
|
||||
| Mola19 03/03/2021 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusCerberusKeyboardController.h |
|
||||
| |
|
||||
| Driver for ASUS Cerberus keyboard |
|
||||
| |
|
||||
| Mola19 03 Mar 2021 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
enum
|
||||
@@ -25,7 +27,6 @@ enum
|
||||
CERBERUS_KEYBOARD_MODE_CUSTOM = 7,
|
||||
};
|
||||
|
||||
|
||||
class AsusCerberusKeyboardController
|
||||
{
|
||||
public:
|
||||
|
||||
+12
-11
@@ -1,11 +1,13 @@
|
||||
/*-----------------------------------------*\
|
||||
| RGBController_AsusCerberusKeyboard.cpp |
|
||||
| |
|
||||
| Generic RGB Interface for Asus Cerberus |
|
||||
| USB controller driver |
|
||||
| |
|
||||
| Mola19 05/28/2022 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusCerberusKeyboard.cpp |
|
||||
| |
|
||||
| RGBController for ASUS Cerberus keyboard |
|
||||
| |
|
||||
| Mola19 28 May 2022 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include <cmath>
|
||||
#include <vector>
|
||||
@@ -23,12 +25,11 @@
|
||||
@comment
|
||||
\*-------------------------------------------------------------------*/
|
||||
|
||||
|
||||
//0xFFFFFFFF indicates an unused entry in matrix
|
||||
#define NA 0xFFFFFFFF
|
||||
|
||||
|
||||
static unsigned int matrix_map[6][24] = {
|
||||
static unsigned int matrix_map[6][24] =
|
||||
{
|
||||
{ 0, NA, 9, 15, 20, 25, NA, 35, 40, 45, 50, 56, 62, 67, 72, NA, 75, 79, 84, NA, NA, NA, NA, NA },
|
||||
{ 1, 6, 10, 16, 21, 26, 30, 36, 41, 46, 51, 57, 63, 68, NA, NA, 76, 80, 85, NA, 88, 93, 97, 102 },
|
||||
{ 2, NA, 11, 17, 22, 27, 31, 37, 42, 47, 52, 58, 64, 69, NA, NA, 77, 81, 86, NA, 89, 94, 98, 103 },
|
||||
|
||||
+10
-8
@@ -1,11 +1,13 @@
|
||||
/*-----------------------------------------*\
|
||||
| RGBController_AsusCerberusKeyboard.h |
|
||||
| |
|
||||
| Generic RGB Interface for Asus Cerberus |
|
||||
| USB controller driver |
|
||||
| |
|
||||
| Mola19 03/03/2021 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusCerberusKeyboard.h |
|
||||
| |
|
||||
| RGBController for ASUS Cerberus keyboard |
|
||||
| |
|
||||
| Mola19 03 Mar 2021 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
@@ -1,5 +1,14 @@
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusLegacyUSBControllerDetect.cpp |
|
||||
| |
|
||||
| Detector for ASUS legacy USB devices |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include <stdexcept>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "Detector.h"
|
||||
#include "AsusCerberusKeyboardController.h"
|
||||
#include "AsusSagarisKeyboardController.h"
|
||||
@@ -55,7 +64,6 @@ void DetectAsusStrixClaw(hid_device_info* info, const std::string& name)
|
||||
}
|
||||
}
|
||||
|
||||
REGISTER_HID_DETECTOR_IPU("ASUS Cerberus Mech", DetectAsusCerberusMech, ASUS_LEGACY_USB_VID, ASUS_CERBERUS_MECH_PID, 1, 0xFF01, 1);
|
||||
REGISTER_HID_DETECTOR_IPU("ASUS Sagaris GK1100", DetectAsusSagarisKeyboard, ASUS_USB_VID, ASUS_SAGARIS_GK1100_PID, 1, 0xFF02, 2);
|
||||
|
||||
REGISTER_HID_DETECTOR_IPU("ASUS ROG Strix Claw", DetectAsusStrixClaw, ASUS_LEGACY_USB_VID, ASUS_ROG_STRIX_CLAW_PID, 0, 0xFF01, 1);
|
||||
REGISTER_HID_DETECTOR_IPU("ASUS Cerberus Mech", DetectAsusCerberusMech, ASUS_LEGACY_USB_VID, ASUS_CERBERUS_MECH_PID, 1, 0xFF01, 1);
|
||||
REGISTER_HID_DETECTOR_IPU("ASUS Sagaris GK1100", DetectAsusSagarisKeyboard, ASUS_USB_VID, ASUS_SAGARIS_GK1100_PID, 1, 0xFF02, 2);
|
||||
REGISTER_HID_DETECTOR_IPU("ASUS ROG Strix Claw", DetectAsusStrixClaw, ASUS_LEGACY_USB_VID, ASUS_ROG_STRIX_CLAW_PID, 0, 0xFF01, 1);
|
||||
|
||||
+12
-12
@@ -1,11 +1,13 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusSagarisKeyboardController.cpp |
|
||||
| |
|
||||
| Driver for ASUS Sagaris USB lighting |
|
||||
| controller |
|
||||
| |
|
||||
| Mola19 08/20/2023 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusSagarisKeyboardController.cpp |
|
||||
| |
|
||||
| Driver for ASUS Sagaris keyboard |
|
||||
| |
|
||||
| Mola19 20 Aug 2023 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include <cstring>
|
||||
#include <math.h>
|
||||
@@ -14,6 +16,7 @@
|
||||
#include <vector>
|
||||
#include "AsusSagarisKeyboardController.h"
|
||||
#include "LogManager.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
#define ASUS_SAGARIS_KB_PACKET_SIZE 65
|
||||
|
||||
@@ -49,10 +52,7 @@ std::string AsusSagarisKeyboardController::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
sagaris_mode AsusSagarisKeyboardController::GetMode()
|
||||
|
||||
+11
-9
@@ -1,17 +1,19 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusSagarisKeyboardController.h |
|
||||
| |
|
||||
| Definitions and types for ASUS Sagaris |
|
||||
| USB RGB lighting controller |
|
||||
| |
|
||||
| Mola19 08/20/2023 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusSagarisKeyboardController.h |
|
||||
| |
|
||||
| Driver for ASUS Sagaris keyboard |
|
||||
| |
|
||||
| Mola19 20 Aug 2023 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
enum
|
||||
|
||||
+106
-101
@@ -1,11 +1,13 @@
|
||||
/*-----------------------------------------*\
|
||||
| RGBController_AsusSagarisKeyboard.cpp |
|
||||
| |
|
||||
| Generic RGB Interface for Asus Sagaris |
|
||||
| USB controller driver |
|
||||
| |
|
||||
| Mola19 08/20/2023 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusSagarisKeyboard.cpp |
|
||||
| |
|
||||
| RGBController for ASUS Sagaris keyboard |
|
||||
| |
|
||||
| Mola19 20 Aug 2023 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
@@ -24,129 +26,129 @@
|
||||
|
||||
RGBController_AsusSagarisKeyboard::RGBController_AsusSagarisKeyboard(AsusSagarisKeyboardController* controller_ptr)
|
||||
{
|
||||
controller = controller_ptr;
|
||||
controller = controller_ptr;
|
||||
|
||||
name = "ASUS Sagaris Keyboard";
|
||||
vendor = "ASUS";
|
||||
type = DEVICE_TYPE_KEYBOARD;
|
||||
description = "ASUS Sagaris Keyboard Device";
|
||||
version = controller->GetVersion();
|
||||
location = controller->GetDeviceLocation();
|
||||
serial = controller->GetSerialString();
|
||||
name = "ASUS Sagaris Keyboard";
|
||||
vendor = "ASUS";
|
||||
type = DEVICE_TYPE_KEYBOARD;
|
||||
description = "ASUS Sagaris Keyboard Device";
|
||||
version = controller->GetVersion();
|
||||
location = controller->GetDeviceLocation();
|
||||
serial = controller->GetSerialString();
|
||||
|
||||
mode Off;
|
||||
Off.name = "Off";
|
||||
Off.value = SAGARIS_KEYBOARD_MODE_OFF;
|
||||
Off.flags = MODE_FLAG_AUTOMATIC_SAVE;
|
||||
Off.color_mode = MODE_COLORS_NONE;
|
||||
Off.name = "Off";
|
||||
Off.value = SAGARIS_KEYBOARD_MODE_OFF;
|
||||
Off.flags = MODE_FLAG_AUTOMATIC_SAVE;
|
||||
Off.color_mode = MODE_COLORS_NONE;
|
||||
modes.push_back(Off);
|
||||
|
||||
mode Static;
|
||||
Static.name = "Static";
|
||||
Static.value = SAGARIS_KEYBOARD_MODE_STATIC;
|
||||
Static.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS;
|
||||
Static.brightness_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
|
||||
Static.brightness_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
|
||||
Static.brightness = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
|
||||
Static.color_mode = MODE_COLORS_MODE_SPECIFIC;
|
||||
Static.colors_min = 1;
|
||||
Static.colors_max = 1;
|
||||
Static.name = "Static";
|
||||
Static.value = SAGARIS_KEYBOARD_MODE_STATIC;
|
||||
Static.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS;
|
||||
Static.brightness_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
|
||||
Static.brightness_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
|
||||
Static.brightness = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
|
||||
Static.color_mode = MODE_COLORS_MODE_SPECIFIC;
|
||||
Static.colors_min = 1;
|
||||
Static.colors_max = 1;
|
||||
Static.colors.resize(1);
|
||||
modes.push_back(Static);
|
||||
|
||||
mode Spiral;
|
||||
Spiral.name = "Spiral";
|
||||
Spiral.value = SAGARIS_KEYBOARD_MODE_SPRIAL;
|
||||
Spiral.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED;
|
||||
Spiral.brightness_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
|
||||
Spiral.brightness_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
|
||||
Spiral.brightness = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
|
||||
Spiral.speed_min = SAGARIS_KEYBOARD_SPEED_MIN;
|
||||
Spiral.speed_max = SAGARIS_KEYBOARD_SPEED_MAX;
|
||||
Spiral.speed = SAGARIS_KEYBOARD_SPEED_DEFAULT;
|
||||
Spiral.color_mode = MODE_COLORS_MODE_SPECIFIC;
|
||||
Spiral.colors_min = 7;
|
||||
Spiral.colors_max = 7;
|
||||
Spiral.name = "Spiral";
|
||||
Spiral.value = SAGARIS_KEYBOARD_MODE_SPRIAL;
|
||||
Spiral.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED;
|
||||
Spiral.brightness_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
|
||||
Spiral.brightness_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
|
||||
Spiral.brightness = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
|
||||
Spiral.speed_min = SAGARIS_KEYBOARD_SPEED_MIN;
|
||||
Spiral.speed_max = SAGARIS_KEYBOARD_SPEED_MAX;
|
||||
Spiral.speed = SAGARIS_KEYBOARD_SPEED_DEFAULT;
|
||||
Spiral.color_mode = MODE_COLORS_MODE_SPECIFIC;
|
||||
Spiral.colors_min = 7;
|
||||
Spiral.colors_max = 7;
|
||||
Spiral.colors.resize(7);
|
||||
modes.push_back(Spiral);
|
||||
|
||||
mode Custom;
|
||||
Custom.name = "Custom";
|
||||
Custom.value = SAGARIS_KEYBOARD_MODE_CUSTOM;
|
||||
Custom.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS;
|
||||
Custom.brightness_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
|
||||
Custom.brightness_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
|
||||
Custom.brightness = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
|
||||
Custom.color_mode = MODE_COLORS_MODE_SPECIFIC;
|
||||
Custom.colors_min = 7;
|
||||
Custom.colors_max = 7;
|
||||
Custom.name = "Custom";
|
||||
Custom.value = SAGARIS_KEYBOARD_MODE_CUSTOM;
|
||||
Custom.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS;
|
||||
Custom.brightness_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
|
||||
Custom.brightness_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
|
||||
Custom.brightness = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
|
||||
Custom.color_mode = MODE_COLORS_MODE_SPECIFIC;
|
||||
Custom.colors_min = 7;
|
||||
Custom.colors_max = 7;
|
||||
Custom.colors.resize(7);
|
||||
modes.push_back(Custom);
|
||||
|
||||
mode Breathing;
|
||||
Breathing.name = "Breathing";
|
||||
Breathing.value = SAGARIS_KEYBOARD_MODE_BREATHING;
|
||||
Breathing.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_SPEED;
|
||||
Breathing.speed_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
|
||||
Breathing.speed_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
|
||||
Breathing.speed = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
|
||||
Breathing.color_mode = MODE_COLORS_MODE_SPECIFIC;
|
||||
Breathing.colors_min = 7;
|
||||
Breathing.colors_max = 7;
|
||||
Breathing.name = "Breathing";
|
||||
Breathing.value = SAGARIS_KEYBOARD_MODE_BREATHING;
|
||||
Breathing.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_SPEED;
|
||||
Breathing.speed_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
|
||||
Breathing.speed_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
|
||||
Breathing.speed = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
|
||||
Breathing.color_mode = MODE_COLORS_MODE_SPECIFIC;
|
||||
Breathing.colors_min = 7;
|
||||
Breathing.colors_max = 7;
|
||||
Breathing.colors.resize(7);
|
||||
modes.push_back(Breathing);
|
||||
|
||||
mode Reactive;
|
||||
Reactive.name = "Reactive";
|
||||
Reactive.value = SAGARIS_KEYBOARD_MODE_REACTIVE;
|
||||
Reactive.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED;
|
||||
Reactive.brightness_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
|
||||
Reactive.brightness_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
|
||||
Reactive.brightness = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
|
||||
Reactive.speed_min = SAGARIS_KEYBOARD_SPEED_MIN;
|
||||
Reactive.speed_max = SAGARIS_KEYBOARD_SPEED_MAX;
|
||||
Reactive.speed = SAGARIS_KEYBOARD_SPEED_DEFAULT;
|
||||
Reactive.color_mode = MODE_COLORS_MODE_SPECIFIC;
|
||||
Reactive.colors_min = 1;
|
||||
Reactive.colors_max = 1;
|
||||
Reactive.name = "Reactive";
|
||||
Reactive.value = SAGARIS_KEYBOARD_MODE_REACTIVE;
|
||||
Reactive.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED;
|
||||
Reactive.brightness_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
|
||||
Reactive.brightness_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
|
||||
Reactive.brightness = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
|
||||
Reactive.speed_min = SAGARIS_KEYBOARD_SPEED_MIN;
|
||||
Reactive.speed_max = SAGARIS_KEYBOARD_SPEED_MAX;
|
||||
Reactive.speed = SAGARIS_KEYBOARD_SPEED_DEFAULT;
|
||||
Reactive.color_mode = MODE_COLORS_MODE_SPECIFIC;
|
||||
Reactive.colors_min = 1;
|
||||
Reactive.colors_max = 1;
|
||||
Reactive.colors.resize(1);
|
||||
modes.push_back(Reactive);
|
||||
|
||||
mode Starry_Night;
|
||||
Starry_Night.name = "Starry Night";
|
||||
Starry_Night.value = SAGARIS_KEYBOARD_MODE_STARRY_NIGHT;
|
||||
Starry_Night.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED;
|
||||
Starry_Night.brightness_min = SAGARIS_KEYBOARD_SPEED_MIN;
|
||||
Starry_Night.brightness_max = SAGARIS_KEYBOARD_SPEED_MAX;
|
||||
Starry_Night.brightness = SAGARIS_KEYBOARD_SPEED_DEFAULT;
|
||||
Starry_Night.speed_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
|
||||
Starry_Night.speed_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
|
||||
Starry_Night.speed = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
|
||||
Starry_Night.color_mode = MODE_COLORS_MODE_SPECIFIC;
|
||||
Starry_Night.colors_min = 7;
|
||||
Starry_Night.colors_max = 7;
|
||||
Starry_Night.name = "Starry Night";
|
||||
Starry_Night.value = SAGARIS_KEYBOARD_MODE_STARRY_NIGHT;
|
||||
Starry_Night.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED;
|
||||
Starry_Night.brightness_min = SAGARIS_KEYBOARD_SPEED_MIN;
|
||||
Starry_Night.brightness_max = SAGARIS_KEYBOARD_SPEED_MAX;
|
||||
Starry_Night.brightness = SAGARIS_KEYBOARD_SPEED_DEFAULT;
|
||||
Starry_Night.speed_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
|
||||
Starry_Night.speed_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
|
||||
Starry_Night.speed = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
|
||||
Starry_Night.color_mode = MODE_COLORS_MODE_SPECIFIC;
|
||||
Starry_Night.colors_min = 7;
|
||||
Starry_Night.colors_max = 7;
|
||||
Starry_Night.colors.resize(7);
|
||||
modes.push_back(Starry_Night);
|
||||
|
||||
mode Laser;
|
||||
Laser.name = "Laser";
|
||||
Laser.value = SAGARIS_KEYBOARD_MODE_LASER;
|
||||
Laser.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED;
|
||||
Laser.brightness_min = SAGARIS_KEYBOARD_SPEED_MIN;
|
||||
Laser.brightness_max = SAGARIS_KEYBOARD_SPEED_MAX;
|
||||
Laser.brightness = SAGARIS_KEYBOARD_SPEED_DEFAULT;
|
||||
Laser.speed_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
|
||||
Laser.speed_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
|
||||
Laser.speed = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
|
||||
Laser.color_mode = MODE_COLORS_MODE_SPECIFIC;
|
||||
Laser.colors_min = 7;
|
||||
Laser.colors_max = 7;
|
||||
Laser.name = "Laser";
|
||||
Laser.value = SAGARIS_KEYBOARD_MODE_LASER;
|
||||
Laser.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED;
|
||||
Laser.brightness_min = SAGARIS_KEYBOARD_SPEED_MIN;
|
||||
Laser.brightness_max = SAGARIS_KEYBOARD_SPEED_MAX;
|
||||
Laser.brightness = SAGARIS_KEYBOARD_SPEED_DEFAULT;
|
||||
Laser.speed_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
|
||||
Laser.speed_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
|
||||
Laser.speed = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
|
||||
Laser.color_mode = MODE_COLORS_MODE_SPECIFIC;
|
||||
Laser.colors_min = 7;
|
||||
Laser.colors_max = 7;
|
||||
Laser.colors.resize(7);
|
||||
modes.push_back(Laser);
|
||||
|
||||
SetupZones();
|
||||
|
||||
sagaris_mode current_mode = controller->GetMode();
|
||||
sagaris_mode current_mode = controller->GetMode();
|
||||
|
||||
active_mode = current_mode.mode;
|
||||
last_mode = current_mode.mode;
|
||||
@@ -155,7 +157,7 @@ RGBController_AsusSagarisKeyboard::RGBController_AsusSagarisKeyboard(AsusSagaris
|
||||
|
||||
current_colors = controller->GetColors();
|
||||
|
||||
for(int i = 0; i < modes[active_mode].colors.size(); i++)
|
||||
for(unsigned int i = 0; i < modes[active_mode].colors.size(); i++)
|
||||
{
|
||||
modes[active_mode].colors[i] = current_colors[i];
|
||||
}
|
||||
@@ -204,19 +206,19 @@ void RGBController_AsusSagarisKeyboard::DeviceUpdateMode()
|
||||
if(last_mode != active_mode)
|
||||
{
|
||||
last_mode = active_mode;
|
||||
for(int i = 0; i < modes[active_mode].colors.size(); i++)
|
||||
for(unsigned int i = 0; i < modes[active_mode].colors.size(); i++)
|
||||
{
|
||||
modes[active_mode].colors[i] = current_colors[i];
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for(int i = 0; i < modes[active_mode].colors.size(); i++)
|
||||
for(unsigned int i = 0; i < modes[active_mode].colors.size(); i++)
|
||||
{
|
||||
current_colors[i] = modes[active_mode].colors[i];
|
||||
}
|
||||
|
||||
for(int i = 0; i < modes[active_mode].colors.size(); i++)
|
||||
for(unsigned int i = 0; i < modes[active_mode].colors.size(); i++)
|
||||
{
|
||||
/*-----------------------------------------*\
|
||||
| This device uses 4bit colorValues (0-16) |
|
||||
@@ -239,7 +241,10 @@ void RGBController_AsusSagarisKeyboard::DeviceUpdateMode()
|
||||
|
||||
uint8_t mode = modes[active_mode].value;
|
||||
|
||||
if(mode == SAGARIS_KEYBOARD_MODE_STARRY_NIGHT) colorIndex = 7;
|
||||
if(mode == SAGARIS_KEYBOARD_MODE_STARRY_NIGHT)
|
||||
{
|
||||
colorIndex = 7;
|
||||
}
|
||||
|
||||
controller->SetMode(mode, modes[active_mode].brightness, modes[active_mode].speed, colorIndex);
|
||||
}
|
||||
|
||||
+10
-8
@@ -1,11 +1,13 @@
|
||||
/*-----------------------------------------*\
|
||||
| RGBController_AsusSagarisKeyboard.h |
|
||||
| |
|
||||
| Generic RGB Interface for Asus Sagaris |
|
||||
| USB controller driver |
|
||||
| |
|
||||
| Mola19 08/20/2023 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusSagarisKeyboard.h |
|
||||
| |
|
||||
| RGBController for ASUS Sagaris keyboard |
|
||||
| |
|
||||
| Mola19 20 Aug 2023 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
+12
-12
@@ -1,15 +1,18 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusStrixClawController.cpp |
|
||||
| |
|
||||
| Driver for ASUS Strix USB |
|
||||
| lighting controller |
|
||||
| |
|
||||
| Mola19 08/06/2022 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusStrixClawController.cpp |
|
||||
| |
|
||||
| Driver for ASUS Strix Claw mouse |
|
||||
| |
|
||||
| Mola19 06 Aug 2022 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include <cstring>
|
||||
#include <string>
|
||||
#include "AsusStrixClawController.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
StrixClawController::StrixClawController(hid_device* dev_handle, const char* path)
|
||||
{
|
||||
@@ -37,10 +40,7 @@ std::string StrixClawController::GetSerialString()
|
||||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
std::string StrixClawController::GetVersion()
|
||||
|
||||
+11
-9
@@ -1,16 +1,18 @@
|
||||
/*-----------------------------------------*\
|
||||
| AsusStrixClawController.h |
|
||||
| |
|
||||
| Definitions and types for ASUS |
|
||||
| Legacy USB RGB lighting controller |
|
||||
| |
|
||||
| Mola19 08/06/2022 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusStrixClawController.h |
|
||||
| |
|
||||
| Driver for ASUS Strix Claw mouse |
|
||||
| |
|
||||
| Mola19 06 Aug 2022 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <hidapi/hidapi.h>
|
||||
#include <hidapi.h>
|
||||
#include "RGBController.h"
|
||||
|
||||
#define HID_MAX_STR 255
|
||||
|
||||
+13
-11
@@ -1,11 +1,13 @@
|
||||
/*-----------------------------------------*\
|
||||
| RGBController_AsusStrixClaw.cpp |
|
||||
| |
|
||||
| Generic RGB Interface for Asus |
|
||||
| Legacy USB controller driver |
|
||||
| |
|
||||
| Mola19 08/06/2022 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusStrixClaw.cpp |
|
||||
| |
|
||||
| RGBController for ASUS Strix Claw mouse |
|
||||
| |
|
||||
| Mola19 06 Aug 2022 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include "RGBController_AsusStrixClaw.h"
|
||||
|
||||
@@ -102,17 +104,17 @@ void RGBController_StrixClaw::ResizeZone(int /*zone*/, int /*new_size*/)
|
||||
|
||||
void RGBController_StrixClaw::DeviceUpdateLEDs()
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
void RGBController_StrixClaw::UpdateZoneLEDs(int /*zone*/)
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
void RGBController_StrixClaw::UpdateSingleLED(int /*led*/)
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
void RGBController_StrixClaw::DeviceUpdateMode()
|
||||
|
||||
+10
-8
@@ -1,11 +1,13 @@
|
||||
/*-----------------------------------------*\
|
||||
| RGBController_AsusStrixClaw.h |
|
||||
| |
|
||||
| Generic RGB Interface for Asus |
|
||||
| Legacy USB controller driver |
|
||||
| |
|
||||
| Mola19 08/06/2022 |
|
||||
\*-----------------------------------------*/
|
||||
/*---------------------------------------------------------*\
|
||||
| RGBController_AsusStrixClaw.h |
|
||||
| |
|
||||
| RGBController for ASUS Strix Claw mouse |
|
||||
| |
|
||||
| Mola19 06 Aug 2022 |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusTUFLaptopController_Linux.cpp |
|
||||
| |
|
||||
| Driver for ASUS TUF laptop |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#include <string>
|
||||
#include "AsusTUFLaptopController_Linux.h"
|
||||
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
#ifndef ASUSTUFLAPTOPLINUXCONTROLLER_H
|
||||
#define ASUSTUFLAPTOPLINUXCONTROLLER_H
|
||||
/*---------------------------------------------------------*\
|
||||
| AsusTUFLaptopController_Linux.h |
|
||||
| |
|
||||
| Driver for ASUS TUF laptop |
|
||||
| |
|
||||
| This file is part of the OpenRGB project |
|
||||
| SPDX-License-Identifier: GPL-2.0-only |
|
||||
\*---------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "RGBController.h"
|
||||
|
||||
@@ -33,5 +41,3 @@ public:
|
||||
unsigned char blue
|
||||
);
|
||||
};
|
||||
|
||||
#endif // ASUSTUFLAPTOPLINUXCONTROLLER_H
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user