Skip to content

Add support for Sabre with 0x1b32 PID #516

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

Open
dirac-comb wants to merge 1 commit into
base: testing
Choose a base branch
from
Open

Add support for Sabre with 0x1b32 PID #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/ckb-daemon/usb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const char* product_str(short product){
return "strafe";
if(product == P_M65)
return "m65";
if(product == P_SABRE_O || product == P_SABRE_L)
if(product == P_SABRE_O || product == P_SABRE_L || product == P_SABRE_O2)
return "sabre";
if(product == P_SCIMITAR)
return "scimitar";
Expand Down
6 changes: 4 additions & 2 deletions src/ckb-daemon/usb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@

#define P_SABRE_O 0x1b14
#define P_SABRE_O_STR "1b14"
#define P_SABRE_O2 0x1b32 /* Observed on a CH-9000111-EU model SABRE */
#define P_SABRE_O2_STR "1b32"
#define P_SABRE_L 0x1b19
#define P_SABRE_L_STR "1b19"
#define IS_SABRE(kb) ((kb)->vendor == V_CORSAIR && ((kb)->product == P_SABRE_O || (kb)->product == P_SABRE_L))
#define IS_SABRE(kb) ((kb)->vendor == V_CORSAIR && ((kb)->product == P_SABRE_O || (kb)->product == P_SABRE_L || (kb)->product == P_SABRE_O2))

#define P_SCIMITAR 0x1b1e
#define P_SCIMITAR_STR "1b1e"
Expand All @@ -61,7 +63,7 @@ const char* product_str(short product);
#define IS_MONOCHROME_DEV(kb) IS_MONOCHROME((kb)->vendor, (kb)->product)

// 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_SCIMITAR)))
#define IS_MOUSE(vendor, product) ((vendor) == (V_CORSAIR) && ((product) == (P_M65) || (product) == (P_SABRE_O) || (product) == (P_SABRE_L) || (product) == (P_SCIMITAR) || (product) == (P_SABRE_O2)))
#define IS_MOUSE_DEV(kb) IS_MOUSE((kb)->vendor, (kb)->product)

// USB delays for when the keyboards get picky about timing
Expand Down
3 changes: 2 additions & 1 deletion src/ckb-daemon/usb_linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,8 @@ static _model models[] = {
{ P_M65_STR, P_M65 },
{ P_SABRE_O_STR, P_SABRE_O },
{ P_SABRE_L_STR, P_SABRE_L },
{ P_SCIMITAR_STR, P_SCIMITAR }
{ P_SCIMITAR_STR, P_SCIMITAR },
{ P_SABRE_O2_STR, P_SABRE_O2 }
};
#define N_MODELS (sizeof(models) / sizeof(_model))

Expand Down
2 changes: 1 addition & 1 deletion src/ckb-daemon/usb_mac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@ int usbmain(){
// Keyboards
P_K65, P_K70, P_K70_NRGB, P_K95, P_K95_NRGB, P_STRAFE, P_STRAFE_NRGB,
// Mice
P_M65, P_SABRE_O, P_SABRE_L, P_SCIMITAR
P_M65, P_SABRE_O, P_SABRE_L, P_SCIMITAR, P_SABRE_O2
};

// Setup global variables
Expand Down
4 changes: 3 additions & 1 deletion src/ckb/fwupgradedialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ static KbId ids[] = {
{ 0x1b1c, 0x1b20, "corsair strafe rgb" },
// Mice
{ 0x1b1c, 0x1b12, "corsair m65 rgb" },
{ 0x1b1c, 0x1b1e, "corsair scimitar rgb" }
{ 0x1b1c, 0x1b1e, "corsair scimitar rgb" },
//SABRE CH-9000111-EU
{ 0x1b1c, 0x1b32, "corsair sabre optical rgb" }
};

static const int DIALOG_WIDTH = 420;
Expand Down