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

Revert "Added Harpoon (0x1b3c) as a Sabre to see if it works."

Browse Source 
This reverts commit 84e195caba.
Harpoon is not working when treated as Sabre, therefore removed
until a proper support is added.

See also: #54,
https://github.com/mattanger/ckb-next/issues/2#issuecomment-276316445
This commit is contained in:
Oleksii Vilchanskyi
2017-05-05 21:42:03 +02:00
parent 7c0831c6d4
commit 1a2dfe2988
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ckb-daemon/usb.c
+1 -1
View File
@@ -34,7 +34,7 @@ const char* product_str(short product){
return "strafe";
if(product == P_M65 || product == P_M65_PRO)
return "m65";
if(product == P_SABRE_O || product == P_SABRE_L || product == P_SABRE_N || product == P_SABRE_O2 || product == P_HARPOON)
if(product == P_SABRE_O || product == P_SABRE_L || product == P_SABRE_N || product == P_SABRE_O2)
return "sabre";
if(product == P_SCIMITAR || product == P_SCIMITAR_PRO)
return "scimitar";
src/ckb-daemon/usb.h
+1 -3
View File
@@ -60,9 +60,7 @@
#define P_SABRE_N_STR "1b2f"
#define P_SABRE_O2 0x1b32 /* Observed on a CH-9000111-EU model SABRE */
#define P_SABRE_O2_STR "1b32"
#define P_HARPOON 0x1b3c /* Harpoon test */
#define P_HARPOON_STR "1b3c"
#define IS_SABRE(kb) ((kb)->vendor == V_CORSAIR && ((kb)->product == P_SABRE_O || (kb)->product == P_SABRE_L || (kb)->product == P_SABRE_N || (kb)->product == P_SABRE_O2 || (kb)->product == P_HARPOON))
#define IS_SABRE(kb) ((kb)->vendor == V_CORSAIR && ((kb)->product == P_SABRE_O || (kb)->product == P_SABRE_L || (kb)->product == P_SABRE_N || (kb)->product == P_SABRE_O2))
#define P_SCIMITAR 0x1b1e
#define P_SCIMITAR_STR "1b1e"
src/ckb-daemon/usb_linux.c
+1 -3
View File
@@ -380,9 +380,7 @@ static _model models[] = {
{ P_SABRE_L_STR, P_SABRE_L },
{ P_SABRE_N_STR, P_SABRE_N },
{ P_SCIMITAR_STR, P_SCIMITAR },
{ P_SCIMITAR_PRO_STR, P_SCIMITAR_PRO },
{ P_SABRE_O2_STR, P_SABRE_O2 },
{ P_HARPOON_STR, P_HARPOON }
{ P_SABRE_O2_STR, P_SABRE_O2 }
};
#define N_MODELS (sizeof(models) / sizeof(_model))
src/ckb-daemon/usb_mac.c
+1 -1
View File
@@ -865,7 +865,7 @@ int usbmain(){
// Keyboards
P_K65, P_K65_NRGB, P_K65_LUX, P_K65_RFIRE, P_K70, P_K70_NRGB, P_K70_LUX, P_K70_LUX_NRGB, P_K70_RFIRE, P_K70_RFIRE_NRGB, P_K95, P_K95_NRGB, P_K95_PLATINUM, P_STRAFE, P_STRAFE_NRGB,
// Mice
P_M65, P_M65_PRO, P_SABRE_O, P_SABRE_L, P_SABRE_N, P_SCIMITAR, P_SCIMITAR_PRO, P_SABRE_O2, P_HARPOON
P_M65, P_M65_PRO, P_SABRE_O, P_SABRE_L, P_SABRE_N, P_SCIMITAR, P_SABRE_O2
};
// Setup global variables