Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes issue26: outdated FIRMWARE version #60

Merged
merged 6 commits into from
Feb 8, 2017
Merged

Fixes issue26: outdated FIRMWARE version #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5e5c8e0
Fixes issue26: outdated FIRMWARE version
frickler24 Feb 4, 2017
b796287
added K70 variants
frickler24 Feb 4, 2017
8fd2944
added K70 Rapidfire RGB
frickler24 Feb 4, 2017
1bdc381
added K95 Platinum RGB in FIRMWARE file
frickler24 Feb 5, 2017
7be9d47
change RAPIDFIRE to RFIRE
frickler24 Feb 5, 2017
90febc3
renamed Firmware directory to .firmware
frickler24 Feb 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ Makefile.*
moc_*
ui_*
qrc_*
.firmware
47 changes: 30 additions & 17 deletions FIRMWARE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,44 @@
-----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: BAF07C6B - 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
iQIcBAEBCAAGBQJYl06/AAoJEDP9ily68HxrKGoQAIOkYQLN+Kf7UtMyw7AEHQ3T
5HmOMv4N5+A2pYjR7iawwaTu4F445YOHGPpkH6Y/ybFEMCRV711DeDPy51F3IrTf
uv/aDOg98n+ZZcNWjqp26FbALEdimZFOjgO1+NEzvXJ3bRqiZ2LS8eo+baeCCP7C
AU0QXK1XyMaxYfJCekJ0hlZXV78HCWcASsFBlfVkF/Vdcsi6GstTsa91Unv0cxCY
/36ER6zOpi7fi+pE34BacBFUL/O0joNbneHw+kMmrmZVICq1jEkKpjHMPl+HdoQP
JMNd50bg33wrKzEHnIEIE9gaWIOkOmVKuHEhuXRvZN+XZ9v2ZjjM13+WbtemP6en
daAyBCS0bvraeB89adX/c4LxRZ3BdBJG8ynL2MfRWDbNgJ7b5eSghr9HgZXV2P0d
XtPvJ5sLNNOyC745iwmr5eytTsEmT/rx5MYO/veGA3/B/BZTcw6ZiCdwtFUMmd0n
zgY8GKtDfv3l/miIdYxjVi5FWDS+Z7vlwaKYcYHk23JA9vRM6z2z8wIcEAqrQlF1
Mgpdl96Jru+ZAMub1od14Dld3/4877L+PWeLbLzrCKe1ux90K8WqSFm+vfAw/EX9
QJsBFQvpgSfepJF3keKaaXuC0FHy2P8tgW5FMSZ/z5KwbATX1Rxm9AhcKpxpQN0T
rz2G7E6Rz4MVsSXIwH2A
=4cPS
-----END PGP SIGNATURE-----
2 changes: 1 addition & 1 deletion src/ckb/binary.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<RCC>
<qresource prefix="/bin">
<file>msckey.gpg</file>
<file>ckb-next-key.gpg</file>
</qresource>
</RCC>
Binary file added src/ckb/ckb-next-key.gpg
View file
Open in desktop
Binary file not shown.
7 changes: 5 additions & 2 deletions src/ckb/kbfirmware.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Binary file removed src/ckb/msckey.gpg
View file
Open in desktop
Binary file not shown.