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

M65 Pro support

Browse Source
This commit is contained in:
ccMSC
2016-06-30 04:37:10 -06:00
parent 7c723573da
commit 58fb4da9a7
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ckb-daemon/usb.c
+1 -1
View File
@@ -32,7 +32,7 @@ const char* product_str(short product){
return "k65";
if(product == P_STRAFE || product == P_STRAFE_NRGB)
return "strafe";
if(product == P_M65)
if(product == P_M65 || product == P_M65_PRO)
return "m65";
if(product == P_SABRE_O || product == P_SABRE_L || product == P_SABRE_N)
return "sabre";
src/ckb-daemon/usb.h
+4 -2
View File
@@ -40,7 +40,9 @@
#define P_M65 0x1b12
#define P_M65_STR "1b12"
#define IS_M65(kb) ((kb)->vendor == V_CORSAIR && ((kb)->product == P_M65))
#define P_M65_PRO 0x1b2e
#define P_M65_PRO_STR "1b2e"
#define IS_M65(kb) ((kb)->vendor == V_CORSAIR && ((kb)->product == P_M65 || (kb)->product == P_M65_PRO))
#define P_SABRE_O 0x1b14 /* optical */
#define P_SABRE_O_STR "1b14"
@@ -74,7 +76,7 @@ const char* product_str(short product);
#define IS_FULLRANGE(kb) (IS_RGB((kb)->vendor, (kb)->product) && (kb)->product != P_K65 && (kb)->product != P_K70 && (kb)->product != P_K95)
// Mouse vs keyboard test
#define IS_MOUSE(vendor, product) ((vendor) == (V_CORSAIR) && ((product) == (P_M65) || (product) == (P_SABRE_O) || (product) == (P_SABRE_L) || (product) == (P_SABRE_N) || (product) == (P_SCIMITAR)))
#define IS_MOUSE(vendor, product) ((vendor) == (V_CORSAIR) && ((product) == (P_M65) || (product) == (P_M65_PRO) || (product) == (P_SABRE_O) || (product) == (P_SABRE_L) || (product) == (P_SABRE_N) || (product) == (P_SCIMITAR)))
#define IS_MOUSE_DEV(kb) IS_MOUSE((kb)->vendor, (kb)->product)
// USB delays for when the keyboards get picky about timing
src/ckb-daemon/usb_linux.c
+1
View File
@@ -365,6 +365,7 @@ static _model models[] = {
{ P_STRAFE_NRGB_STR, P_STRAFE_NRGB },
// Mice
{ P_M65_STR, P_M65 },
{ P_M65_PRO_STR, P_M65_PRO },
{ P_SABRE_O_STR, P_SABRE_O },
{ P_SABRE_L_STR, P_SABRE_L },
{ P_SABRE_N_STR, P_SABRE_N },
src/ckb-daemon/usb_mac.c
+1 -1
View File
@@ -772,7 +772,7 @@ int usbmain(){
// Keyboards
P_K65, P_K65_LUX, P_K65_RFIRE, P_K70, P_K70_NRGB, P_K70_LUX, P_K70_RFIRE, P_K95, P_K95_NRGB, P_STRAFE, P_STRAFE_NRGB,
// Mice
P_M65, P_SABRE_O, P_SABRE_L, P_SABRE_N, P_SCIMITAR
P_M65, P_M65_PRO, P_SABRE_O, P_SABRE_L, P_SABRE_N, P_SCIMITAR
};
// Setup global variables