Salastil/ckb-next
1
0
Fork 0
mirror of https://github.com/ckb-next/ckb-next.git synced 2026-10-10 12:27:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merged master into testing

Browse Source
This commit is contained in:
mattanger
2017-02-07 19:55:15 -05:00
parent 300a51a7b8 7301ee8e0d
commit 4d06ec9363
7 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -13,3 +13,4 @@ Makefile.*
moc_*
ui_*
qrc_*
.firmware
FIRMWARE
+25 -17
View File
@@ -1,31 +1,39 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
# My GPG key: 8DC8D309 - A full copy of it can also be found in src/ckb/msckey.gpg
# The GPG key: DCEF2F5F - A full copy of it can also be found in src/ckb/ckb-next-key.gpg
# This document is signed to prevent tampering. Signature verification is enabled only when GnuPG is available.
# Firmware versions listed may not necessarily reflect the latest on Corsair's site; new versions will not be added until ckb has been tested with them.
# ckb does NOT read this file when flashing firmware manually. It will allow you to load any valid FW blob (at your own risk).
# ckb-next does NOT read this file when flashing firmware manually. It will allow you to load any valid FW blob (at your own risk).
#
# -------->>>>>> for Scimitar is a 2.4 available, for Strafe 2.05 !
#
!BEGIN FW ENTRIES
# Vendor Model FW URL Min.ckb File Name SHA256
Corsair K70RGB 2.05 http://www3.corsair.com/software/HID/K70RGB.zip 0.2.6 K70RGB_APP_V205.bin 3e43bdcc5077dc413fbdee7ff6e57a978f758599142eef6979a96e3b8c3a566a
Corsair K95RGB 2.05 http://www3.corsair.com/software/HID/K95RGB.zip 0.2.6 K95RGB_APP_V205.bin 8d0680dd033d6020a53bc9bfa83e761143699d1122f1d0133e95ad3056d63a15
Corsair STRAFE 2.04 http://www3.corsair.com/software/HID/STRAFE.zip 0.2.6 STRAFE_APP_V204.bin 51156ae7aa5b04405668582496cf28bbfb2e492accf93c65c3072aca9ef7ed65
Corsair STRAFERGB 2.05 http://www3.corsair.com/software/HID/STRAFERGB.zip 0.2.6 STRAFERGB_APP_V205.bin dff16fec9a0ae0d33aad0482f9ea02e3e55e231706b8c4e7fb66820aba98adc5
Corsair M65RGB 2.02 http://www3.corsair.com/software/HID/M65RGB.zip 0.2.5 M65RGB_App_v202.bin 0b6080b98d9199fd23837b7927e7868420f458f2f24ac545f33e34f79c317a79
Corsair SCIMITARRGB 2.03 http://www3.corsair.com/software/HID/Scimitar.zip 0.2.5 Scimitar_App_v203.bin 59194c3ae8a6ae0a801f7b6cf528ad292ae996923699cf063c7deed38fb326aa
# Vendor Model FW URL Min.ckb File Name SHA256
Corsair K70RGB 2.05 https://www3.corsair.com/software/HID/K70RGB.zip 0.2.7 K70RGB_APP_V205.bin 3e43bdcc5077dc413fbdee7ff6e57a978f758599142eef6979a96e3b8c3a566a
Corsair K70LUX 2.04 https://www3.corsair.com/software/HID/K70LUX.zip 0.2.7 K70LUX_APP_V204.bin c2b5411e1dce391788eca294563801b32a14bf7802eb29688213f8f07e112966
Corsair K70LUXRGB 2.05 https://www3.corsair.com/software/HID/K70LUXRGB.zip 0.2.7 K70LUX_APP_V205.bin a1a0a4b2f74890eb708435b21ab197a301ea668269bca895f89f7301c354e83d
Corsair K70RFIRE 2.05 https://www3.corsair.com/software/HID/K70RAPIDFIRE.zip 0.2.7 K70RAPIDFIRE_APP_V205.bin 6b1d2bb962ffd987ce5eb25c46b02a9069c5f79ca05d7b2cc71c749fe9813536
Corsair K70RFIRERGB 2.05 https://www3.corsair.com/software/HID/K70RGBRAPIDFIRE.zip 0.2.7 K70RGBRAPIDFIRE_APP_V205.bin a5962bd1d890f5061fcf242fa8d3ca806913f899f37585d4367420aaded25104
Corsair K95RGB 2.05 https://www3.corsair.com/software/HID/K95RGB.zip 0.2.7 K95RGB_APP_V205.bin 8d0680dd033d6020a53bc9bfa83e761143699d1122f1d0133e95ad3056d63a15
Corsair K95PLATINUMRGB 1.07123 https://www3.corsair.com/software/HID/K95RGBPLATINUM.zip 0.2.7 FREYA_App_v1.07.123.bin 6d06b443cd85f4256d2b518b66b5c2d490d8089b678f9e34aecea97b13c5f5d4
Corsair STRAFE 2.04 https://www3.corsair.com/software/HID/STRAFE.zip 0.2.7 STRAFE_APP_V204.bin 51156ae7aa5b04405668582496cf28bbfb2e492accf93c65c3072aca9ef7ed65
Corsair STRAFERGB 2.05 https://www3.corsair.com/software/HID/STRAFERGB.zip 0.2.7 STRAFERGB_APP_V205.bin dff16fec9a0ae0d33aad0482f9ea02e3e55e231706b8c4e7fb66820aba98adc5
Corsair M65RGB 2.04 https://www3.corsair.com/software/HID/M65RGB.zip 0.2.7 M65RGB_App_v204.bin e1f09ce462f77071f91d92951410c14fb18061dd9760b3de89e45d1ca8b6b46c
Corsair SCIMITARRGB 2.03 https://www3.corsair.com/software/HID/Scimitar.zip 0.2.7 Scimitar_App_v203.bin 59194c3ae8a6ae0a801f7b6cf528ad292ae996923699cf063c7deed38fb326aa
!END FW ENTRIES
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQEcBAEBCAAGBQJXdMclAAoJEBXtkzSNyNMJRnQIAL0sz5zhYX2OKTDkZ+BTndh+
c5sq45o3M7GPsE3fRsDAt9BE2PU1K69dDdIv2oeKldvsgShhcF/iYYKDBVCH3Gai
jFKljnSpoBLy+aU77Pf2tBb9BC3yzD9MKUa+Rh2hOCwKGtXZwq2DqLoJwRl6KSbD
+oI4DF4M3pAhxG0FgxAeGfro1NIO2YPBULIH6qDdFxVTE+JoLlCkKslqTFBWEzvd
9L2bA4mOxJhsEt1be6twJ9vGiPfHMq8AKjNLsbJ3hg+E3Lft4X7ySG2uqSPYRK37
5t3d+H9aJg22oEZfU7VuykhdlTijmc88ekQZIb3v2cMHXi2HcBNxUIDVXq3dkbA=
=TQno
iQEzBAEBCAAdFiEE2efsyk0ijiZmMKgW3+JI69zvL18FAliaY8IACgkQ3+JI69zv
L1/xCAf9GMBKfc1td2WqXKp+27gDSiZOk/M+ZbiR9z5E2GVnNw2sQMalcvv5yUZ1
il5vYh/UtbgS8jpiFXJNWV9DoI59AquHAMppvAPO98j7pN3sfn2ZDRSADh9mJ3nT
b9IcXMcrUeRR2JqWG6MxA1Fz0UATLrp9wYlDo7J78V2/vK3bZwpTuDc5su1PGXD3
ORLNbVjr8DTLbsJpySHxY4RcJ/H1jnAQG3LwzoFXBMjm77M6B+CUN/dv4QXEGQEh
6OG3/Mssb5+l6XGjytihEuHaK8laTNbAJ0cwYZu91vca7Sjpwq1ZXX11CA+XfvHs
bqKRbf9YqV81l8ZOyAIfx0M5vSj8uw==
=rLNC
-----END PGP SIGNATURE-----
README.md
+10
View File
@@ -1,6 +1,8 @@
ckb-next: RGB Driver for Linux and OS X
==================================
<a target="_blank" href="http://webchat.freenode.net?channels=%23ckb-next&uio=d4"><img src="https://cloud.githubusercontent.com/assets/493242/14886493/5c660ea2-0d51-11e6-8249-502e6c71e9f2.png" height = "20" /></a>
**ckb-next** is an open-source driver for Corsair keyboards and mice. It aims to bring the features of their proprietary CUE software to the Linux and Mac operating systems. This project is currently a work in progress, but it already supports much of the same functionality, including full RGB animations. More features are coming soon. Testing and bug reports are appreciated!
![Screenshot](https://i.imgur.com/zMK9jOP.png)
@@ -199,6 +201,14 @@ If you have multiple devices, combine them with commas, starting after the `=`.
If it still doesn't work, try replacing `0x20000408` with `0x4`. Note that this will cause the kernel driver to ignore the device(s) completely, so you need to ensure ckb-daemon is running at boot or else you'll have no input. This will not work if you are using full-disk encryption.
If you see **GLib** critical errors like
`GLib-GObject-CRITICAL **: g_type_add_interface_static: assertion 'G_TYPE_IS_INSTANTIATABLE (instance_type)' failed`
and you are using:
- Qt 5.8 and newer, remove your Qt configuration files and restart the ckb GUI. Also watch out for different style overridings in dotfiles under `~/` generated by Qt automatically, remove them as well.
- Qt 5.7 and lower, install `qt5ct` package on Arch Linux (find a similar one for your distribution). That's all. This is a known Qt bug. It happened because Qt did not ship required GTK files.
If you're using **Unity** and the tray icon doesn't appear correctly, run `sudo apt-get install libappindicator-dev`. Then reinstall ckb.
#### OS X/macOS
src/ckb/binary.qrc
+1 -1
View File
@@ -1,5 +1,5 @@
<RCC>
<qresource prefix="/bin">
<file>msckey.gpg</file>
<file>ckb-next-key.gpg</file>
</qresource>
</RCC>
src/ckb/ckb-next-key.gpg
BIN
View File
Binary file not shown.
src/ckb/kbfirmware.cpp
+5 -2
View File
@@ -32,7 +32,10 @@ bool KbFirmware::_checkUpdates(){
quint64 now = QDateTime::currentMSecsSinceEpoch();
if(now < lastCheck + AUTO_CHECK_TIME)
return false;
tableDownload = networkManager->get(QNetworkRequest(QUrl("https://raw.githubusercontent.com/ccMSC/ckb/master/FIRMWARE")));
// First location is for debugging only.
// tableDownload = networkManager->get(QNetworkRequest(QUrl("https://raw.githubusercontent.com/frickler24/ckb-next/issues-26-Firmware-Incident/FIRMWARE")));
// This one is the production one.
tableDownload = networkManager->get(QNetworkRequest(QUrl("https://raw.githubusercontent.com/mattanger/ckb-next/master/FIRMWARE")));
connect(tableDownload, SIGNAL(finished()), this, SLOT(downloadFinished()));
lastCheck = now;
return true;
@@ -83,7 +86,7 @@ void KbFirmware::processDownload(QNetworkReply* reply){
firmware.close();
// Write GPG key
QString keyPath = tmp.absoluteFilePath(QString("ckb-%1-key.gpg").arg(pid));
if(!QFile::copy(":/bin/msckey.gpg", keyPath)){
if(!QFile::copy(":/bin/ckb-next-key.gpg", keyPath)){
firmware.remove();
qDebug() << "Failed to write GPG key to temporary location, aborting firmware check";
return;
src/ckb/msckey.gpg
BIN
View File
Binary file not shown.