mattanger · mattanger · Feb 8, 2017 · Feb 4, 2017 · Feb 4, 2017 · Feb 4, 2017
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ Makefile.*
 moc_*
 ui_*
 qrc_*
+Firmware
diff --git a/FIRMWARE b/FIRMWARE
@@ -1,31 +1,42 @@
 -----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 K70RAPIDFIRE  2.05 https://www3.corsair.com/software/HID/K70RAPIDFIRE.zip 0.2.7   K70RAPIDFIRE_APP_V205.bin   6b1d2bb962ffd987ce5eb25c46b02a9069c5f79ca05d7b2cc71c749fe9813536
+  Corsair K95RGB        2.05 https://www3.corsair.com/software/HID/K95RGB.zip       0.2.7   K95RGB_APP_V205.bin         8d0680dd033d6020a53bc9bfa83e761143699d1122f1d0133e95ad3056d63a15
+  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
+iQIcBAEBCAAGBQJYlhWeAAoJEDP9ily68HxrYdIP/1evjifCxwTt9e5Rf75U5Bq2
+hN3K4dQib7G0BDi15jmHS59+rPhbnHMK1z/uPp+kol+pzQvxdL28Xp2FKPLzH5FC
+zDJjKu0p2yUMYJ80OQf1YCq3Z2s1VxTVb0BXpHYeSeT6mCEQsmM5w5yfFcQmDBCj
+1Y9iEzAdTv40EPt3HAb08SBAe9zNBiQydeoIKGI2UVWbIfE/4B5FNKGF2p5QoVps
+lDt+hCVsvqPT0Z/1h7QTJ1r6bB0T9LhfosWDR4oTaEMZ+7IUJoIMO0wciKcNM3d9
+FH4wL1FUHClsrIpOQrcbN44n2MtIJsiMhCaWYNizW29o8FfyQUgC4OOulmnaynLS
+n7jGgomOazgXuwaCpcmHCot3+Bj7akxrDHYHN5Kwueg2iuUvvGCdk28temm1Yplb
+Kg/APDkNlsT3sxX4qm8VLABl0mSlfReeTsmqAVMT2AJt6crgmItaX8RvFCXPFd3u
+HKx+i5HBHvQhl+su8+JNiyEafIV4RFCUgLD2QpiJg8/O/lup1T6wKXw2ioDtD02b
+i/CcW2mp1DDN9pqSWx87nlBySTWikw7QGLyliVWCWfsKeY6cDV96pbS7o4e+PL9b
+z1tgBasIfS1TBMZdOKxsY7EaKL6uMuLhyngZXvsxReluSkuISaV+LgZu53UsWxBJ
+lObUFEix+rVgW6rGYaCw
+=2sQX
 -----END PGP SIGNATURE-----
diff --git a/src/ckb/binary.qrc b/src/ckb/binary.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/bin">
-        <file>msckey.gpg</file>
+        <file>ckb-next-key.gpg</file>
     </qresource>
 </RCC>
diff --git a/src/ckb/ckb-next-key.gpg b/src/ckb/ckb-next-key.gpg
diff --git a/src/ckb/kbfirmware.cpp b/src/ckb/kbfirmware.cpp
@@ -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;

diff --git a/src/ckb/msckey.gpg b/src/ckb/msckey.gpg
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,3 +13,4 @@ Makefile.* @@
     moc_*
     ui_*
     qrc_*
+    Firmware